LU-9410 ldiskfs: no check mb bitmap if flex_bg enabled

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / rhel6.6 / ext4-corrupted-inode-block-bitmaps-handling-patches.patch

diff --git a/ldiskfs/kernel_patches/patches/rhel6.6/ext4-corrupted-inode-block-bitmaps-handling-patches.patch b/ldiskfs/kernel_patches/patches/rhel6.6/ext4-corrupted-inode-block-bitmaps-handling-patches.patch
index 8ab3de5..568d552 100644 (file)
--- a/ldiskfs/kernel_patches/patches/rhel6.6/ext4-corrupted-inode-block-bitmaps-handling-patches.patch
+++ b/ldiskfs/kernel_patches/patches/rhel6.6/ext4-corrupted-inode-block-bitmaps-handling-patches.patch
@@ -249,14 +249,14 @@ index efcf909..06cd929 100644
 @@ -3382,9 +3401,10 @@ int ext4_mb_check_ondisk_bitmap(struct super_block *sb, void *bitmap,
        }
  
-       if (free != ext4_free_blks_count(sb, gdp)) {
+       if (free != free_in_gdp) {
 -              ext4_error(sb, "on-disk bitmap for group %d"
 -                      "corrupted: %u blocks free in bitmap, %u - in gd\n",
--                      group, free, ext4_free_blks_count(sb, gdp));
+-                      group, free, free_in_gdp);
 +              ext4_corrupted_block_group(sb, group,
 +                              EXT4_GROUP_INFO_BBITMAP_CORRUPT,
 +                              "on-disk bitmap for group %d corrupted: %u blocks free in bitmap, %u - in gd\n",
-+                              group, free, ext4_free_blks_count(sb, gdp));
++                              group, free, free_in_gdp);
                return -EIO;
        }
        return 0;