e2fsck: allow to fix some superblock corruptions

[tools/e2fsprogs.git] / lib / ext2fs / check_desc.c

diff --git a/lib/ext2fs/check_desc.c b/lib/ext2fs/check_desc.c
index a6fcc45..3e3fa94 100644 (file)
--- a/lib/ext2fs/check_desc.c
+++ b/lib/ext2fs/check_desc.c
@@ -42,6 +42,9 @@ errcode_t ext2fs_check_desc(ext2_filsys fs)
 
        EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
 
+       if (EXT2_DESC_SIZE(fs->super) & (EXT2_DESC_SIZE(fs->super) - 1))
+               return EXT2_ET_BAD_DESC_SIZE;
+
        retval = ext2fs_allocate_subcluster_bitmap(fs, "check_desc map", &bmap);
        if (retval)
                return retval;
@@ -50,8 +53,7 @@ errcode_t ext2fs_check_desc(ext2_filsys fs)
                ext2fs_reserve_super_and_bgd(fs, i, bmap);
 
        for (i = 0; i < fs->group_desc_count; i++) {
-               if (!EXT2_HAS_INCOMPAT_FEATURE(fs->super,
-                                              EXT4_FEATURE_INCOMPAT_FLEX_BG)) {
+               if (!ext2fs_has_feature_flex_bg(fs->super)) {
                        first_block = ext2fs_group_first_block2(fs, i);
                        last_block = ext2fs_group_last_block2(fs, i);
                }