From 6a4ae9bd851e996e22c98ca69a33ff49d8872f9f Mon Sep 17 00:00:00 2001 From: Nikolay Borisov Date: Fri, 8 Jun 2018 15:47:48 +0300 Subject: [PATCH] btrfs-progs: Make update_block_group take fs_info instead of root This is in preparation of delayed refs code. Signed-off-by: Nikolay Borisov Reviewed-by: Qu Wenruo Signed-off-by: David Sterba --- extent-tree.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/extent-tree.c b/extent-tree.c index 07b5fb99..6e7a1932 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -1912,12 +1912,10 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans, return 0; } -static int update_block_group(struct btrfs_root *root, - u64 bytenr, u64 num_bytes, int alloc, - int mark_free) +static int update_block_group(struct btrfs_fs_info *info, u64 bytenr, + u64 num_bytes, int alloc, int mark_free) { struct btrfs_block_group_cache *cache; - struct btrfs_fs_info *info = root->fs_info; u64 total = num_bytes; u64 old_val; u64 byte_in_group; @@ -2368,7 +2366,8 @@ static int __free_extent(struct btrfs_trans_handle *trans, BUG_ON(ret); } - update_block_group(root, bytenr, num_bytes, 0, mark_free); + update_block_group(trans->fs_info, bytenr, num_bytes, 0, + mark_free); } fail: btrfs_free_path(path); @@ -2730,7 +2729,7 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans, btrfs_mark_buffer_dirty(leaf); btrfs_free_path(path); - ret = update_block_group(root, ins->objectid, fs_info->nodesize, + ret = update_block_group(fs_info, ins->objectid, fs_info->nodesize, 1, 0); return ret; } @@ -3413,7 +3412,7 @@ int btrfs_update_block_group(struct btrfs_root *root, u64 bytenr, u64 num_bytes, int alloc, int mark_free) { - return update_block_group(root, bytenr, num_bytes, + return update_block_group(root->fs_info, bytenr, num_bytes, alloc, mark_free); }