This patch removes parameter @trans of check_leaf_items(). 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> --- cmds-check.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cmds-check.c b/cmds-check.c index b78adba3203f..a45bb7c61deb 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -2680,8 +2680,7 @@ static int check_inode_item(struct btrfs_root *root, struct btrfs_path *path, static int check_tree_block_ref(struct btrfs_root *root, struct extent_buffer *eb, u64 bytenr, int level, u64 owner, struct node_refs *nrefs); -static int check_leaf_items(struct btrfs_trans_handle *trans, - struct btrfs_root *root, struct btrfs_path *path, +static int check_leaf_items(struct btrfs_root *root, struct btrfs_path *path, struct node_refs *nrefs, int account_bytes); /* @@ -2770,8 +2769,8 @@ static int walk_down_tree_v2(struct btrfs_trans_handle *trans, ret = process_one_leaf_v2(root, path, nrefs, level, ext_ref); else - ret = check_leaf_items(trans, root, path, - nrefs, account_file_data); + ret = check_leaf_items(root, path, nrefs, + account_file_data); err |= ret; break; } else { @@ -13568,8 +13567,7 @@ out: /* * Main entry function to check known items and update related accounting info */ -static int check_leaf_items(struct btrfs_trans_handle *trans, - struct btrfs_root *root, struct btrfs_path *path, +static int check_leaf_items(struct btrfs_root *root, struct btrfs_path *path, struct node_refs *nrefs, int account_bytes) { struct btrfs_fs_info *fs_info = root->fs_info; -- 2.15.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