RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-15 10:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: check: stop passing csum root around

Browse Source 
We pass the csum root from way high in the call chain in check down to
where we actually need it.  However we can just get it from the fs_info
in these places, so clean up the functions to skip passing around the
csum root needlessly.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Josef Bacik 2021-11-10 15:07:58 -05:00 committed by David Sterba
parent 08b63c0fc5
commit 8742a38d5f
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
check/main.c
View File

@ -9507,9 +9507,9 @@ static int populate_csum(struct btrfs_trans_handle *trans,
}
static int fill_csum_tree_from_one_fs_root(struct btrfs_trans_handle *trans,
struct btrfs_root *csum_root,
struct btrfs_root *cur_root)
{
struct btrfs_root *csum_root = gfs_info->csum_root;
struct btrfs_path path;
struct btrfs_key key;
struct extent_buffer *node;
@ -9570,8 +9570,7 @@ out:
return ret;
}
static int fill_csum_tree_from_fs(struct btrfs_trans_handle *trans,
struct btrfs_root *csum_root)
static int fill_csum_tree_from_fs(struct btrfs_trans_handle *trans)
{
struct btrfs_path path;
struct btrfs_root *tree_root = gfs_info->tree_root;
@ -9611,8 +9610,7 @@ static int fill_csum_tree_from_fs(struct btrfs_trans_handle *trans,
key.objectid);
goto out;
}
ret = fill_csum_tree_from_one_fs_root(trans, csum_root,
cur_root);
ret = fill_csum_tree_from_one_fs_root(trans, cur_root);
if (ret < 0)
goto out;
next:
@ -9630,10 +9628,10 @@ out:
return ret;
}
static int fill_csum_tree_from_extent(struct btrfs_trans_handle *trans,
struct btrfs_root *csum_root)
static int fill_csum_tree_from_extent(struct btrfs_trans_handle *trans)
{
struct btrfs_root *extent_root = gfs_info->extent_root;
struct btrfs_root *csum_root = gfs_info->csum_root;
struct btrfs_path path;
struct btrfs_extent_item *ei;
struct extent_buffer *leaf;
@ -9703,13 +9701,12 @@ static int fill_csum_tree_from_extent(struct btrfs_trans_handle *trans,
* will use fs/subvol trees to init the csum tree.
*/
static int fill_csum_tree(struct btrfs_trans_handle *trans,
struct btrfs_root *csum_root,
int search_fs_tree)
{
if (search_fs_tree)
return fill_csum_tree_from_fs(trans, csum_root);
return fill_csum_tree_from_fs(trans);
else
return fill_csum_tree_from_extent(trans, csum_root);
return fill_csum_tree_from_extent(trans);
}
static void free_roots_info_cache(void)
@ -10713,8 +10710,7 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv)
goto close_out;
}
ret = fill_csum_tree(trans, gfs_info->csum_root,
init_extent_tree);
ret = fill_csum_tree(trans, init_extent_tree);
err |= !!ret;
if (ret) {
error("checksum tree refilling failed: %d", ret);