@@ -6229,10 +6229,17 @@ static int check_type_with_root(u64 rootid, u8 key_type)
break;
case BTRFS_EXTENT_ITEM_KEY:
case BTRFS_METADATA_ITEM_KEY:
- case BTRFS_BLOCK_GROUP_ITEM_KEY:
if (rootid != BTRFS_EXTENT_TREE_OBJECTID)
goto err;
break;
+ case BTRFS_BLOCK_GROUP_ITEM_KEY:
+ if (btrfs_fs_incompat(gfs_info, EXTENT_TREE_V2)) {
+ if (rootid != BTRFS_BLOCK_GROUP_TREE_OBJECTID)
+ goto err;
+ } else if (rootid != BTRFS_EXTENT_TREE_OBJECTID) {
+ goto err;
+ }
+ break;
case BTRFS_ROOT_ITEM_KEY:
if (rootid != BTRFS_ROOT_TREE_OBJECTID)
goto err;
@@ -9453,6 +9460,18 @@ again:
return ret;
}
+ /*
+ * If we are extent tree v2 then we can reint the block group root as
+ * well.
+ */
+ if (btrfs_fs_incompat(gfs_info, EXTENT_TREE_V2)) {
+ ret = btrfs_fsck_reinit_root(trans, gfs_info->block_group_root);
+ if (ret) {
+ fprintf(stderr, "block group initialization failed\n");
+ return ret;
+ }
+ }
+
/*
* Now we have all the in-memory block groups setup so we can make
* allocations properly, and the metadata we care about is safe since we
@@ -5530,7 +5530,7 @@ int check_chunks_and_extents_lowmem(void)
key.offset = 0;
key.type = BTRFS_ROOT_ITEM_KEY;
- ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
+ ret = btrfs_search_slot(NULL, gfs_info->tree_root, &key, &path, 0, 0);
if (ret) {
error("cannot find extent tree in tree_root");
goto out;
@@ -5565,7 +5565,7 @@ int check_chunks_and_extents_lowmem(void)
if (ret)
goto out;
next:
- ret = btrfs_next_item(root, &path);
+ ret = btrfs_next_item(gfs_info->tree_root, &path);
if (ret)
goto out;
}
This makes the appropriate changes to enable the block group tree checking for both lowmem and normal check modes. This is relatively straightforward, simply need to use the helper to get the right root for dealing with block groups. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- check/main.c | 21 ++++++++++++++++++++- check/mode-lowmem.c | 4 ++-- 2 files changed, 22 insertions(+), 3 deletions(-)