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 61a1de6..3e3fa94 100644 (file)
--- a/lib/ext2fs/check_desc.c
+++ b/lib/ext2fs/check_desc.c
@@ -4,11 +4,12 @@
  * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
 #if HAVE_UNISTD_H
@@ -34,14 +35,17 @@ errcode_t ext2fs_check_desc(ext2_filsys fs)
        ext2fs_block_bitmap bmap;
        errcode_t retval;
        dgrp_t i;
-       blk_t first_block = fs->super->s_first_data_block;
-       blk_t last_block = ext2fs_blocks_count(fs->super)-1;
+       blk64_t first_block = fs->super->s_first_data_block;
+       blk64_t last_block = ext2fs_blocks_count(fs->super)-1;
        blk64_t blk, b;
-       int j;
+       unsigned int j;
 
        EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
 
-       retval = ext2fs_allocate_block_bitmap(fs, "check_desc map", &bmap);
+       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;
 
@@ -49,12 +53,9 @@ 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);
-                       if (i == (fs->group_desc_count - 1))
-                               last_block = ext2fs_blocks_count(fs->super)-1;
                }
 
                /*