p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

btrfs: make fs_devices a local variable in btrfs_parse_early_options 

fs_devices is always passed to btrfs_scan_one_device which overrides it.
In the call stack below fs_devices is passed to btrfs_scan_one_device
from btrfs_mount_root.  In btrfs_mount_root the output fs_devices of
this call stack is not used.

btrfs_mount_root
  btrfs_parse_early_options
    btrfs_scan_one_device

So, it is not necessary to pass fs_devices from btrfs_mount_root, using
a local variable in btrfs_parse_early_options is enough.

Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
Reviewed-by: Anand Jain <Anand.Jain@oracle.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Gu Jinxiang 2018-07-12 14:23:15 +08:00 committed by David Sterba
parent 81ffd56b57
commit d64dcbd183
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/btrfs/super.c
View File

@ -884,10 +884,11 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options,
* only when we need to allocate a new super block. * only when we need to allocate a new super block.
*/ */
static int btrfs_parse_early_options(const char *options, fmode_t flags, static int btrfs_parse_early_options(const char *options, fmode_t flags,
void *holder, struct btrfs_fs_devices **fs_devices) void *holder)
{ {
substring_t args[MAX_OPT_ARGS]; substring_t args[MAX_OPT_ARGS];
char *device_name, *opts, *orig, *p; char *device_name, *opts, *orig, *p;
struct btrfs_fs_devices *fs_devices = NULL;
int error = 0; int error = 0;
lockdep_assert_held(&uuid_mutex); lockdep_assert_held(&uuid_mutex);
@ -918,7 +919,7 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags,
goto out; goto out;
} }
error = btrfs_scan_one_device(device_name, error = btrfs_scan_one_device(device_name,
flags, holder, fs_devices); flags, holder, &fs_devices);
kfree(device_name); kfree(device_name);
if (error) if (error)
goto out; goto out;
@ -1554,7 +1555,7 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type,
} }
mutex_lock(&uuid_mutex); mutex_lock(&uuid_mutex);
error = btrfs_parse_early_options(data, mode, fs_type, &fs_devices); error = btrfs_parse_early_options(data, mode, fs_type);
if (error) { if (error) {
mutex_unlock(&uuid_mutex); mutex_unlock(&uuid_mutex);
goto error_fs_info; goto error_fs_info;