summaryrefslogtreecommitdiff
path: root/extent-tree.c
diff options
context:
space:
mode:
authorNikolay Borisov <nborisov@suse.com>2018-06-08 15:47:48 +0300
committerDavid Sterba <dsterba@suse.com>2018-08-06 15:01:53 +0200
commit6a4ae9bd851e996e22c98ca69a33ff49d8872f9f (patch)
treeb8fa1d1c1fc033ffaa3603a9e5c2f897ba5055e9 /extent-tree.c
parent3a0cf26beed04189a51d7e7f5a94bf3c7736fafc (diff)
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 <nborisov@suse.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'extent-tree.c')
-rw-r--r--extent-tree.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/extent-tree.c b/extent-tree.c
index 07b5fb9..6e7a193 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);
}