From e68e73318f0f66d2deba346575418247cadfc1e9 Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Mon, 8 Nov 2021 14:26:47 -0500 Subject: [PATCH] btrfs-progs: check: fill csum root from all extent roots We may have multiple extent roots, so cycle through all of the extent roots and populate the csum tree based on the content of every extent root we have in the file system. Signed-off-by: Josef Bacik Signed-off-by: David Sterba --- check/main.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/check/main.c b/check/main.c index 337ab82f..5d1eed52 100644 --- a/check/main.c +++ b/check/main.c @@ -9703,9 +9703,9 @@ out: return ret; } -static int fill_csum_tree_from_extent(struct btrfs_trans_handle *trans) +static int fill_csum_tree_from_extent(struct btrfs_trans_handle *trans, + struct btrfs_root *extent_root) { - struct btrfs_root *extent_root = btrfs_extent_root(gfs_info, 0); struct btrfs_root *csum_root; struct btrfs_path path; struct btrfs_extent_item *ei; @@ -9779,10 +9779,26 @@ static int fill_csum_tree_from_extent(struct btrfs_trans_handle *trans) static int fill_csum_tree(struct btrfs_trans_handle *trans, int search_fs_tree) { + struct btrfs_root *root; + struct rb_node *n; + int ret; + if (search_fs_tree) return fill_csum_tree_from_fs(trans); - else - return fill_csum_tree_from_extent(trans); + + root = btrfs_extent_root(gfs_info, 0); + while (1) { + ret = fill_csum_tree_from_extent(trans, root); + if (ret) + break; + n = rb_next(&root->rb_node); + if (!n) + break; + root = rb_entry(n, struct btrfs_root, rb_node); + if (root->root_key.objectid != BTRFS_EXTENT_TREE_OBJECTID) + break; + } + return ret; } static void free_roots_info_cache(void)