Commit e7e02096 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba

btrfs: Remove fs_info from btrfs_make_block_group

This function is always called with a valid transaction handle from
where we can reference the fs_info. No functional changes.
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 88a979c6
...@@ -2716,8 +2716,8 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info); ...@@ -2716,8 +2716,8 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info);
int btrfs_read_block_groups(struct btrfs_fs_info *info); int btrfs_read_block_groups(struct btrfs_fs_info *info);
int btrfs_can_relocate(struct btrfs_fs_info *fs_info, u64 bytenr); int btrfs_can_relocate(struct btrfs_fs_info *fs_info, u64 bytenr);
int btrfs_make_block_group(struct btrfs_trans_handle *trans, int btrfs_make_block_group(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, u64 bytes_used, u64 bytes_used, u64 type, u64 chunk_offset,
u64 type, u64 chunk_offset, u64 size); u64 size);
void btrfs_add_raid_kobjects(struct btrfs_fs_info *fs_info); void btrfs_add_raid_kobjects(struct btrfs_fs_info *fs_info);
struct btrfs_trans_handle *btrfs_start_trans_remove_block_group( struct btrfs_trans_handle *btrfs_start_trans_remove_block_group(
struct btrfs_fs_info *fs_info, struct btrfs_fs_info *fs_info,
......
...@@ -10241,10 +10241,10 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans) ...@@ -10241,10 +10241,10 @@ void btrfs_create_pending_block_groups(struct btrfs_trans_handle *trans)
trans->can_flush_pending_bgs = can_flush_pending_bgs; trans->can_flush_pending_bgs = can_flush_pending_bgs;
} }
int btrfs_make_block_group(struct btrfs_trans_handle *trans, int btrfs_make_block_group(struct btrfs_trans_handle *trans, u64 bytes_used,
struct btrfs_fs_info *fs_info, u64 bytes_used,
u64 type, u64 chunk_offset, u64 size) u64 type, u64 chunk_offset, u64 size)
{ {
struct btrfs_fs_info *fs_info = trans->fs_info;
struct btrfs_block_group_cache *cache; struct btrfs_block_group_cache *cache;
int ret; int ret;
......
...@@ -4900,7 +4900,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, ...@@ -4900,7 +4900,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
refcount_inc(&em->refs); refcount_inc(&em->refs);
write_unlock(&em_tree->lock); write_unlock(&em_tree->lock);
ret = btrfs_make_block_group(trans, info, 0, type, start, num_bytes); ret = btrfs_make_block_group(trans, 0, type, start, num_bytes);
if (ret) if (ret)
goto error_del_extent; goto error_del_extent;
...@@ -5175,7 +5175,7 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len) ...@@ -5175,7 +5175,7 @@ int btrfs_num_copies(struct btrfs_fs_info *fs_info, u64 logical, u64 len)
/* /*
* There could be two corrupted data stripes, we need * There could be two corrupted data stripes, we need
* to loop retry in order to rebuild the correct data. * to loop retry in order to rebuild the correct data.
* *
* Fail a stripe at a time on every retry except the * Fail a stripe at a time on every retry except the
* stripe under reconstruction. * stripe under reconstruction.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment