[PATCH v4 15/18] btrfs-progs: lowmem check: remove parameter @trans of check_btrfs_root()

[Su Yue]

Remove parameters @trans of delete_extent_item() and walk_down_tree_v2().

Note: This patch and next patches cause error in lowmem repair like:
"Error: Commit_root already set when starting transaction".
This error will disappear after removing @trans finished.

Signed-off-by: Su Yue <suy.f...@cn.fujitsu.com>
---
 check/mode-lowmem.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c
index d4c8de4e69af..d92278d2993c 100644
--- a/check/mode-lowmem.c
+++ b/check/mode-lowmem.c
@@ -4271,8 +4271,7 @@ out:
  * Returns <0  Fatal error, must exit the whole check
  * Returns 0   No errors found
  */
-static int walk_down_tree(struct btrfs_trans_handle *trans,
-                         struct btrfs_root *root, struct btrfs_path *path,
+static int walk_down_tree(struct btrfs_root *root, struct btrfs_path *path,
                          int *level, struct node_refs *nrefs, int ext_ref,
                          int check_all)
 {
@@ -4585,8 +4584,7 @@ out:
  * 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)
 {
        struct btrfs_path path;
@@ -4631,7 +4629,7 @@ static int check_btrfs_root(struct btrfs_trans_handle 
*trans,
        }
 
        while (1) {
-               ret = walk_down_tree(trans, root, &path, &level, &nrefs,
+               ret = walk_down_tree(root, &path, &level, &nrefs,
                                     ext_ref, check_all);
 
                if (ret > 0)
@@ -4667,7 +4665,7 @@ out:
 static int check_fs_root(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);
 }
 
 /*
@@ -4871,11 +4869,11 @@ int check_chunks_and_extents_lowmem(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);
@@ -4906,7 +4904,7 @@ int check_chunks_and_extents_lowmem(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)
-- 
2.16.1



--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html