btrfs: tree-checker: check remap-tree flags in btrfs_check_chunk_valid()

Add a check to btrfs_check_chunk_valid() that the METADATA_REMAP and
REMAPPED flags are only set if the REMAP_TREE incompat flag is also set.

Signed-off-by: Mark Harmstone <mark@harmstone.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
index d5146ea8ff28ea8bea7690c86c676858ae015ee2..9efa4116e0061b05ca32bd9447eb8a6165f7ba7d 100644 (file)
--- a/fs/btrfs/tree-checker.c
+++ b/fs/btrfs/tree-checker.c
@@ -999,6 +999,20 @@ int btrfs_check_chunk_valid(const struct btrfs_fs_info *fs_info,
                }
        }
 
+       if (unlikely((type & BTRFS_BLOCK_GROUP_METADATA_REMAP) &&
+                    !(features & BTRFS_FEATURE_INCOMPAT_REMAP_TREE))) {
+               chunk_err(fs_info, leaf, chunk, logical,
+               "METADATA_REMAP chunk type without REMAP_TREE incompat bit");
+               return -EUCLEAN;
+       }
+
+       if (unlikely(remapped &&
+                    !(features & BTRFS_FEATURE_INCOMPAT_REMAP_TREE))) {
+               chunk_err(fs_info, leaf, chunk, logical,
+               "REMAPPED chunk flag without REMAP_TREE incompat bit");
+               return -EUCLEAN;
+       }
+
        if (!remapped &&
            !valid_stripe_count(type & BTRFS_BLOCK_GROUP_PROFILE_MASK,
                                num_stripes, sub_stripes)) {