| Message ID | d14782aff5d269a5875faf845938f3cf2d122295.1486977712.git.dsterba@suse.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, Feb 13, 2017 at 10:34:19AM +0100, David Sterba wrote: > We grab fs_info from other parameters. > Reviewed-by: Liu Bo <bo.li.liu@oracle.com> Thanks, -liubo > Signed-off-by: David Sterba <dsterba@suse.com> > --- > fs/btrfs/volumes.c | 10 ++++------ > 1 file 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) > / sizeof(struct btrfs_stripe) + 1) > > static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, > - struct btrfs_fs_info *fs_info, u64 start, > - u64 type) > + u64 start, u64 type) > { > struct btrfs_fs_info *info = trans->fs_info; > struct btrfs_fs_devices *fs_devices = info->fs_devices; > @@ -5009,7 +5008,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans, > > ASSERT(mutex_is_locked(&fs_info->chunk_mutex)); > chunk_offset = find_next_chunk(fs_info); > - return __btrfs_alloc_chunk(trans, fs_info, chunk_offset, type); > + return __btrfs_alloc_chunk(trans, chunk_offset, type); > } > > static 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, > > chunk_offset = find_next_chunk(fs_info); > alloc_profile = btrfs_get_alloc_profile(extent_root, 0); > - ret = __btrfs_alloc_chunk(trans, fs_info, chunk_offset, alloc_profile); > + ret = __btrfs_alloc_chunk(trans, chunk_offset, alloc_profile); > if (ret) > return ret; > > sys_chunk_offset = find_next_chunk(fs_info); > alloc_profile = btrfs_get_alloc_profile(fs_info->chunk_root, 0); > - ret = __btrfs_alloc_chunk(trans, fs_info, sys_chunk_offset, > - alloc_profile); > + ret = __btrfs_alloc_chunk(trans, sys_chunk_offset, alloc_profile); > return ret; > } > > -- > 2.10.1 > > -- > 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 -- 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/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) / sizeof(struct btrfs_stripe) + 1) static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, - struct btrfs_fs_info *fs_info, u64 start, - u64 type) + u64 start, u64 type) { struct btrfs_fs_info *info = trans->fs_info; struct btrfs_fs_devices *fs_devices = info->fs_devices; @@ -5009,7 +5008,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans, ASSERT(mutex_is_locked(&fs_info->chunk_mutex)); chunk_offset = find_next_chunk(fs_info); - return __btrfs_alloc_chunk(trans, fs_info, chunk_offset, type); + return __btrfs_alloc_chunk(trans, chunk_offset, type); } static 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, chunk_offset = find_next_chunk(fs_info); alloc_profile = btrfs_get_alloc_profile(extent_root, 0); - ret = __btrfs_alloc_chunk(trans, fs_info, chunk_offset, alloc_profile); + ret = __btrfs_alloc_chunk(trans, chunk_offset, alloc_profile); if (ret) return ret; sys_chunk_offset = find_next_chunk(fs_info); alloc_profile = btrfs_get_alloc_profile(fs_info->chunk_root, 0); - ret = __btrfs_alloc_chunk(trans, fs_info, sys_chunk_offset, - alloc_profile); + ret = __btrfs_alloc_chunk(trans, sys_chunk_offset, alloc_profile); return ret; }
We grab fs_info from other parameters. Signed-off-by: David Sterba <dsterba@suse.com> --- fs/btrfs/volumes.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)