| Message ID | 70e9faa71c1360e0f28db4031b0c2796d35f2cc9.1529516228.git.dsterba@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/21/2018 01:51 AM, David Sterba wrote: > Prepartory work to fix race between mount and device scan. > > btrfs_parse_early_options calls the device scan from mount and we'll > need to let mount completely manage the critical section. > > Signed-off-by: David Sterba <dsterba@suse.com> Reviewed-by: Anand Jain <anand.jain@oracle.com> Thanks, Anand > --- > fs/btrfs/super.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c > index ee82d02f5453..e3324ddf2777 100644 > --- a/fs/btrfs/super.c > +++ b/fs/btrfs/super.c > @@ -892,6 +892,8 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags, > char *device_name, *opts, *orig, *p; > int error = 0; > > + lockdep_assert_held(&uuid_mutex); > + > if (!options) > return 0; > > @@ -917,10 +919,8 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags, > error = -ENOMEM; > goto out; > } > - mutex_lock(&uuid_mutex); > error = btrfs_scan_one_device(device_name, > flags, holder, fs_devices); > - mutex_unlock(&uuid_mutex); > kfree(device_name); > if (error) > goto out; > @@ -1528,8 +1528,10 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type, > if (!(flags & SB_RDONLY)) > mode |= FMODE_WRITE; > > + mutex_lock(&uuid_mutex); > error = btrfs_parse_early_options(data, mode, fs_type, > &fs_devices); > + mutex_unlock(&uuid_mutex); > if (error) { > return ERR_PTR(error); > } > -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index ee82d02f5453..e3324ddf2777 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -892,6 +892,8 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags, char *device_name, *opts, *orig, *p; int error = 0; + lockdep_assert_held(&uuid_mutex); + if (!options) return 0; @@ -917,10 +919,8 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags, error = -ENOMEM; goto out; } - mutex_lock(&uuid_mutex); error = btrfs_scan_one_device(device_name, flags, holder, fs_devices); - mutex_unlock(&uuid_mutex); kfree(device_name); if (error) goto out; @@ -1528,8 +1528,10 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type, if (!(flags & SB_RDONLY)) mode |= FMODE_WRITE; + mutex_lock(&uuid_mutex); error = btrfs_parse_early_options(data, mode, fs_type, &fs_devices); + mutex_unlock(&uuid_mutex); if (error) { return ERR_PTR(error); }
Prepartory work to fix race between mount and device scan. btrfs_parse_early_options calls the device scan from mount and we'll need to let mount completely manage the critical section. Signed-off-by: David Sterba <dsterba@suse.com> --- fs/btrfs/super.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)