From b4c4ff9c4a15eb0d97ab9dd6f12f7bc9774d0d7b Mon Sep 17 00:00:00 2001 From: Nikolay Borisov Date: Mon, 28 May 2018 09:36:41 +0300 Subject: btrfs-progs: check: Remove root parameter from btrfs_fix_block_accounting It's always set to extent_root and the function already takes a transaction handle where fs_info could be referenced and in turn the extent_tree. Signed-off-by: Nikolay Borisov Reviewed-by: Su Yue Signed-off-by: David Sterba --- check/main.c | 2 +- check/mode-lowmem.c | 2 +- convert/main.c | 2 +- ctree.h | 3 +-- extent-tree.c | 8 +++----- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/check/main.c b/check/main.c index 4cf243d9..71cc1673 100644 --- a/check/main.c +++ b/check/main.c @@ -7671,7 +7671,7 @@ repair_abort: goto repair_abort; } - ret = btrfs_fix_block_accounting(trans, root); + ret = btrfs_fix_block_accounting(trans); if (ret) goto repair_abort; ret = btrfs_commit_transaction(trans, root); diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index 9890180d..410c5f63 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -556,7 +556,7 @@ static int repair_block_accounting(struct btrfs_fs_info *fs_info) return ret; } - ret = btrfs_fix_block_accounting(trans, root); + ret = btrfs_fix_block_accounting(trans); btrfs_commit_transaction(trans, root); return ret; } diff --git a/convert/main.c b/convert/main.c index 80f3bed8..7077fcba 100644 --- a/convert/main.c +++ b/convert/main.c @@ -957,7 +957,7 @@ static int init_btrfs(struct btrfs_mkfs_config *cfg, struct btrfs_root *root, ret = PTR_ERR(trans); goto err; } - ret = btrfs_fix_block_accounting(trans, root); + ret = btrfs_fix_block_accounting(trans); if (ret) goto err; ret = make_convert_data_block_groups(trans, fs_info, cfg, cctx); diff --git a/ctree.h b/ctree.h index 697895a9..c833ad69 100644 --- a/ctree.h +++ b/ctree.h @@ -2500,8 +2500,7 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans, u64 num_bytes, u64 empty_size, u64 hint_byte, u64 search_end, struct btrfs_key *ins, bool is_data); -int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans, - struct btrfs_root *root); +int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans); void btrfs_pin_extent(struct btrfs_fs_info *fs_info, u64 bytenr, u64 num_bytes); void btrfs_unpin_extent(struct btrfs_fs_info *fs_info, u64 bytenr, u64 num_bytes); diff --git a/extent-tree.c b/extent-tree.c index 1b8a4f8c..3132ccc8 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -3788,8 +3788,7 @@ out: * Fixup block accounting. The initial block accounting created by * make_block_groups isn't accuracy in this case. */ -int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans, - struct btrfs_root *root) +int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans) { int ret = 0; int slot; @@ -3799,9 +3798,8 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans, struct btrfs_key key; struct extent_buffer *leaf; struct btrfs_block_group_cache *cache; - struct btrfs_fs_info *fs_info = root->fs_info; - - root = root->fs_info->extent_root; + struct btrfs_fs_info *fs_info = trans->fs_info; + struct btrfs_root *root = fs_info->extent_root; while(extent_root_pending_ops(fs_info)) { ret = finish_current_insert(trans, root); -- cgit v1.2.3