btrfs: add missing unlikely to a couple error checks during sys chunk array validation

It's unexpected to find errors during sys chunk array validation and all
checks use the unlikely tag except for two of them, so add it.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 94a7e9059a7b3f90e6e69a29617c104e952f710e..21b72c90bd90f93cba59389e9c9409de58f5ad29 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2387,7 +2387,7 @@ static int validate_sys_chunk_array(const struct btrfs_fs_info *fs_info,
                }
                ret = btrfs_check_chunk_valid(fs_info, NULL, chunk, key.offset,
                                              sectorsize);
-               if (ret < 0)
+               if (unlikely(ret < 0))
                        return ret;
                cur += btrfs_chunk_item_size(num_stripes);
        }

diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c
index 0f4f1b347c9e8e0bed35438f872be2ba3cd10887..9cd79d97b9b5e71544db0998b87d3359d816f74e 100644 (file)
--- a/fs/btrfs/tree-checker.c
+++ b/fs/btrfs/tree-checker.c
@@ -1121,9 +1121,9 @@ int btrfs_check_chunk_valid(const struct btrfs_fs_info *fs_info,
                return -EUCLEAN;
        }
 
-       if (!remapped &&
-           !valid_stripe_count(type & BTRFS_BLOCK_GROUP_PROFILE_MASK,
-                               num_stripes, sub_stripes)) {
+       if (unlikely(!remapped &&
+                    !valid_stripe_count(type & BTRFS_BLOCK_GROUP_PROFILE_MASK,
+                                        num_stripes, sub_stripes))) {
                chunk_err(fs_info, leaf, chunk, logical,
                        "invalid num_stripes:sub_stripes %u:%u for profile %llu",
                        num_stripes, sub_stripes,