diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2016-06-22 18:54:24 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-12-06 16:06:59 +0100 |
| commit | 2ff7e61e0d30ff166a2ae94575526bffe11fd1a8 (patch) | |
| tree | a2b8aba1d10c010cc247f3e0866dcbd627e852f3 /fs/btrfs/super.c | |
| parent | afdb571890615059ed4f0625209b379aff6cb08d (diff) | |
| download | linux-stable-2ff7e61e0d30ff166a2ae94575526bffe11fd1a8.tar.gz linux-stable-2ff7e61e0d30ff166a2ae94575526bffe11fd1a8.tar.bz2 linux-stable-2ff7e61e0d30ff166a2ae94575526bffe11fd1a8.zip | |
btrfs: take an fs_info directly when the root is not used otherwise
There are loads of functions in btrfs that accept a root parameter
but only use it to obtain an fs_info pointer. Let's convert those to
just accept an fs_info pointer directly.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index fa2f33fe8c6c..3021b0f32e53 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -396,10 +396,9 @@ static const match_table_t tokens = { * reading in a new superblock is parsed here. * XXX JDM: This needs to be cleaned up for remount. */ -int btrfs_parse_options(struct btrfs_root *root, char *options, +int btrfs_parse_options(struct btrfs_fs_info *info, char *options, unsigned long new_flags) { - struct btrfs_fs_info *info = root->fs_info; substring_t args[MAX_OPT_ARGS]; char *p, *num, *orig = NULL; u64 cache_gen; @@ -1733,7 +1732,7 @@ static int btrfs_remount(struct super_block *sb, int *flags, char *data) } } - ret = btrfs_parse_options(root, data, *flags); + ret = btrfs_parse_options(fs_info, data, *flags); if (ret) { ret = -EINVAL; goto restore; |