@@ -2705,8 +2705,7 @@ static int check_leaf_items(struct btrfs_root *root, struct btrfs_path *path,
* Returns <0 Fatal error, must exit the whole check
* Returns 0 No errors found
*/
-static int walk_down_tree_v2(struct btrfs_trans_handle *trans,
- struct btrfs_root *root, struct btrfs_path *path,
+static int walk_down_tree_v2(struct btrfs_root *root, struct btrfs_path *path,
int *level, struct node_refs *nrefs, int ext_ref,
int check_all)
@@ -6580,8 +6579,7 @@ static struct data_backref *find_data_backref(struct extent_record *rec,
* Returns 0 represents OK.
* Returns > 0 represents error bits.
*/
-static int check_btrfs_root(struct btrfs_trans_handle *trans,
- struct btrfs_root *root, unsigned int ext_ref,
+static int check_btrfs_root(struct btrfs_root *root, unsigned int ext_ref,
int check_all)
{
@@ -6627,8 +6625,8 @@ static int check_btrfs_root(struct btrfs_trans_handle *trans,
}
while (1) {
- ret = walk_down_tree_v2(trans, root, &path, &level, &nrefs,
- ext_ref, check_all);
+ ret = walk_down_tree_v2(root, &path, &level, &nrefs, ext_ref,
+ check_all);
if (ret > 0)
err |= ret;
@@ -6663,7 +6661,7 @@ out:
static int check_fs_root_v2(struct btrfs_root *root, unsigned int ext_ref)
{
reset_cached_block_groups(root->fs_info);
- return !!check_btrfs_root(NULL, root, ext_ref, 0);
+ return !!check_btrfs_root(root, ext_ref, 0);
}
/*
@@ -13709,11 +13707,11 @@ static int check_chunks_and_extents_v2(struct btrfs_fs_info *fs_info)
}
root1 = root->fs_info->chunk_root;
- ret = check_btrfs_root(trans, root1, 0, 1);
+ ret = check_btrfs_root(root1, 0, 1);
err |= ret;
root1 = root->fs_info->tree_root;
- ret = check_btrfs_root(trans, root1, 0, 1);
+ ret = check_btrfs_root(root1, 0, 1);
err |= ret;
btrfs_init_path(&path);
@@ -13744,7 +13742,7 @@ static int check_chunks_and_extents_v2(struct btrfs_fs_info *fs_info)
goto next;
}
- ret = check_btrfs_root(trans, cur_root, 0, 1);
+ ret = check_btrfs_root(cur_root, 0, 1);
err |= ret;
if (key.objectid == BTRFS_TREE_RELOC_OBJECTID)
Remove parameters @trans of delete_extent_item() and walk_down_tree_v2(). Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com> --- cmds-check.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)