summaryrefslogtreecommitdiff
path: root/fs/btrfs/super.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2018-06-19 17:09:47 +0200
committerDavid Sterba <dsterba@suse.com>2018-08-06 13:12:47 +0200
commitf5194e34cabaddd348a90f950e0a8188dd26cdc0 (patch)
tree8a7b478717ccb4bb87575d1594d437adebb552e3 /fs/btrfs/super.c
parent899f9307c33ce4758c30a076b10ed54d5c91c6e7 (diff)
btrfs: lift uuid_mutex to callers of btrfs_open_devices
Prepartory work to fix race between mount and device scan. The callers will have to manage the critical section, eg. mount wants to scan and then call btrfs_open_devices without the ioctl scan walking in and modifying the fs devices in the meantime. Reviewed-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/super.c')
-rw-r--r--fs/btrfs/super.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 0b6567f0c63d..d470eb6b9226 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1567,7 +1567,9 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type,
goto error_fs_info;
}
+ mutex_lock(&uuid_mutex);
error = btrfs_open_devices(fs_devices, mode, fs_type);
+ mutex_unlock(&uuid_mutex);
if (error)
goto error_fs_info;