marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
master
Nikolay Borisov 2018-06-08 15:47:48 +03:00 committed by David Sterba
parent 3a0cf26bee
commit 6a4ae9bd85
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extent-tree.c
View File

@ -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);
}