1 files changed, 4 insertions, 8 deletions

diff --git a/fs/ext2/super.c b/fs/ext2/super.c
index 75af3fbe8384..1ba18b72d43a 100644
--- a/fs/ext2/super.c
+++ b/fs/ext2/super.c
@@ -617,27 +617,24 @@ static int ext2_setup_super (struct super_block * sb,
         return res;
 }
 
-static int ext2_check_descriptors (struct super_block * sb)
+static int ext2_check_descriptors(struct super_block *sb)
 {
         int i;
-        int desc_block = 0;
         struct ext2_sb_info *sbi = EXT2_SB(sb);
         unsigned long first_block = le32_to_cpu(sbi->s_es->s_first_data_block);
         unsigned long last_block;
-        struct ext2_group_desc * gdp = NULL;
 
         ext2_debug ("Checking group descriptors");
 
-        for (i = 0; i < sbi->s_groups_count; i++)
-        {
+        for (i = 0; i < sbi->s_groups_count; i++) {
+                struct ext2_group_desc *gdp = ext2_get_group_desc(sb, i, NULL);
+
                 if (i == sbi->s_groups_count - 1)
                         last_block = le32_to_cpu(sbi->s_es->s_blocks_count) - 1;
                 else
                         last_block = first_block +
                                 (EXT2_BLOCKS_PER_GROUP(sb) - 1);
 
-                if ((i % EXT2_DESC_PER_BLOCK(sb)) == 0)
-                        gdp = (struct ext2_group_desc *) sbi->s_group_desc[desc_block++]->b_data;
                 if (le32_to_cpu(gdp->bg_block_bitmap) < first_block ||
                     le32_to_cpu(gdp->bg_block_bitmap) > last_block)
                 {
@@ -667,7 +664,6 @@ static int ext2_check_descriptors (struct super_block * sb)
                         return 0;
                 }
                 first_block += EXT2_BLOCKS_PER_GROUP(sb);
-                gdp++;
         }
         return 1;
 }