Just some minor modification. - original mode: * Block group item can occur in extent tree and bg tree. - lowmem mode: * search block group items in bg tree if BG_TREE feature is set.
Signed-off-by: Qu Wenruo <w...@suse.com> --- check/main.c | 3 ++- check/mode-lowmem.c | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/check/main.c b/check/main.c index 94ffab46cb70..3fd0bb2317bb 100644 --- a/check/main.c +++ b/check/main.c @@ -6034,7 +6034,8 @@ static int check_type_with_root(u64 rootid, u8 key_type) case BTRFS_EXTENT_ITEM_KEY: case BTRFS_METADATA_ITEM_KEY: case BTRFS_BLOCK_GROUP_ITEM_KEY: - if (rootid != BTRFS_EXTENT_TREE_OBJECTID) + if (rootid != BTRFS_EXTENT_TREE_OBJECTID && + rootid != BTRFS_BLOCK_GROUP_TREE_OBJECTID) goto err; break; case BTRFS_ROOT_ITEM_KEY: diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index 5f7f101daab1..fcb8210984eb 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -4365,7 +4365,7 @@ next: static int check_chunk_item(struct btrfs_fs_info *fs_info, struct extent_buffer *eb, int slot) { - struct btrfs_root *extent_root = fs_info->extent_root; + struct btrfs_root *root; struct btrfs_root *dev_root = fs_info->dev_root; struct btrfs_path path; struct btrfs_key chunk_key; @@ -4387,6 +4387,11 @@ static int check_chunk_item(struct btrfs_fs_info *fs_info, int ret; int err = 0; + if (btrfs_fs_incompat(fs_info, BG_TREE)) + root = fs_info->bg_root; + else + root = fs_info->extent_root; + btrfs_item_key_to_cpu(eb, &chunk_key, slot); chunk = btrfs_item_ptr(eb, slot, struct btrfs_chunk); length = btrfs_chunk_length(eb, chunk); @@ -4406,7 +4411,7 @@ static int check_chunk_item(struct btrfs_fs_info *fs_info, bg_key.offset = length; btrfs_init_path(&path); - ret = btrfs_search_slot(NULL, extent_root, &bg_key, &path, 0, 0); + ret = btrfs_search_slot(NULL, root, &bg_key, &path, 0, 0); if (ret) { error( "chunk[%llu %llu) did not find the related block group item", -- 2.23.0