[PATCH v2 16/20] btrfs-progs: check: make reinit work per found root item
From: Josef Bacik <josef@toxicpanda.com>
Date: 2021-11-08 19:27:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
Instead of looking for the first extent root or csum root in memory, scan through the tree root and re-init any root items that match the given objectid. This will allow reinit to work with both extent tree v1 and extent tree v2 global roots when using the --reinit option. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- check/main.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-)
diff --git a/check/main.c b/check/main.c
index e3e5a336..140cd427 100644
--- a/check/main.c
+++ b/check/main.c@@ -9319,6 +9319,52 @@ out: return ret; } +static int reinit_global_roots(struct btrfs_trans_handle *trans, u64 objectid) +{ + struct btrfs_key key = { + .objectid = objectid, + .type = BTRFS_ROOT_ITEM_KEY, + .offset = 0, + }; + struct btrfs_path path; + struct btrfs_root *tree_root = gfs_info->tree_root; + struct btrfs_root *root; + int ret; + + btrfs_init_path(&path); + while (1) { + ret = btrfs_search_slot(NULL, tree_root, &key, &path, 0, 0); + if (ret) { + if (ret == 1) { + /* We should at least find the first one. */ + if (key.offset == 0) + ret = -ENOENT; + else + ret = 0; + } + break; + } + + btrfs_item_key_to_cpu(path.nodes[0], &key, path.slots[0]); + if (key.objectid != objectid) + break; + btrfs_release_path(&path); + root = btrfs_read_fs_root(gfs_info, &key); + if (IS_ERR(root)) { + error("Error reading global root [%llu %llu]", + key.objectid, key.offset); + ret = PTR_ERR(root); + break; + } + ret = btrfs_fsck_reinit_root(trans, root); + if (ret) + break; + key.offset++; + } + btrfs_release_path(&path); + return ret; +} + static int reinit_extent_tree(struct btrfs_trans_handle *trans, bool pin) { u64 start = 0;
@@ -9375,7 +9421,7 @@ again: } /* Ok we can allocate now, reinit the extent root */ - ret = btrfs_fsck_reinit_root(trans, btrfs_extent_root(gfs_info, 0)); + ret = reinit_global_roots(trans, BTRFS_EXTENT_TREE_OBJECTID); if (ret) { fprintf(stderr, "extent root initialization failed\n"); /*
@@ -10699,8 +10745,8 @@ static int cmd_check(const struct cmd_struct *cmd, int argc, char **argv) if (init_csum_tree) { printf("Reinitialize checksum tree\n"); - ret = btrfs_fsck_reinit_root(trans, - btrfs_csum_root(gfs_info, 0)); + ret = reinit_global_roots(trans, + BTRFS_CSUM_TREE_OBJECTID); if (ret) { error("checksum tree initialization failed: %d", ret);
--
2.26.3