aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2017-02-10 13:46:27 -0500
committerDavid Sterba <dsterba@suse.com>2017-02-17 06:03:53 -0500
commit72b468c8daeba50ac85e9d7b92eda18a55c56d18 (patch)
tree3ab1adc028dcf87cb25e4042e855f950908b685a
parent56e033a7874ae4bb5204a38fd5d5cf99c1311321 (diff)
btrfs: remove unused parameter from __btrfs_alloc_chunk
We grab fs_info from other parameters. Reviewed-by: Liu Bo <bo.li.liu@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/volumes.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 3c3c69c0eee4..d234625e4e02 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4584,8 +4584,7 @@ static void check_raid56_incompat_flag(struct btrfs_fs_info *info, u64 type)
4584 / sizeof(struct btrfs_stripe) + 1) 4584 / sizeof(struct btrfs_stripe) + 1)
4585 4585
4586static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, 4586static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
4587 struct btrfs_fs_info *fs_info, u64 start, 4587 u64 start, u64 type)
4588 u64 type)
4589{ 4588{
4590 struct btrfs_fs_info *info = trans->fs_info; 4589 struct btrfs_fs_info *info = trans->fs_info;
4591 struct btrfs_fs_devices *fs_devices = info->fs_devices; 4590 struct btrfs_fs_devices *fs_devices = info->fs_devices;
@@ -5009,7 +5008,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
5009 5008
5010 ASSERT(mutex_is_locked(&fs_info->chunk_mutex)); 5009 ASSERT(mutex_is_locked(&fs_info->chunk_mutex));
5011 chunk_offset = find_next_chunk(fs_info); 5010 chunk_offset = find_next_chunk(fs_info);
5012 return __btrfs_alloc_chunk(trans, fs_info, chunk_offset, type); 5011 return __btrfs_alloc_chunk(trans, chunk_offset, type);
5013} 5012}
5014 5013
5015static noinline int init_first_rw_device(struct btrfs_trans_handle *trans, 5014static noinline int init_first_rw_device(struct btrfs_trans_handle *trans,
@@ -5024,14 +5023,13 @@ static noinline int init_first_rw_device(struct btrfs_trans_handle *trans,
5024 5023
5025 chunk_offset = find_next_chunk(fs_info); 5024 chunk_offset = find_next_chunk(fs_info);
5026 alloc_profile = btrfs_get_alloc_profile(extent_root, 0); 5025 alloc_profile = btrfs_get_alloc_profile(extent_root, 0);
5027 ret = __btrfs_alloc_chunk(trans, fs_info, chunk_offset, alloc_profile); 5026 ret = __btrfs_alloc_chunk(trans, chunk_offset, alloc_profile);
5028 if (ret) 5027 if (ret)
5029 return ret; 5028 return ret;
5030 5029
5031 sys_chunk_offset = find_next_chunk(fs_info); 5030 sys_chunk_offset = find_next_chunk(fs_info);
5032 alloc_profile = btrfs_get_alloc_profile(fs_info->chunk_root, 0); 5031 alloc_profile = btrfs_get_alloc_profile(fs_info->chunk_root, 0);
5033 ret = __btrfs_alloc_chunk(trans, fs_info, sys_chunk_offset, 5032 ret = __btrfs_alloc_chunk(trans, sys_chunk_offset, alloc_profile);
5034 alloc_profile);
5035 return ret; 5033 return ret;
5036} 5034}
5037 5035