Whamcloud - gitweb
git://git.whamcloud.com / tools / e2fsprogs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix EXT4_FEATURE_RO_COMPAT_HUGE_FILE check
[tools/e2fsprogs.git] / lib / ext2fs / blknum.c
diff --git a/lib/ext2fs/blknum.c b/lib/ext2fs/blknum.c
index 9b25ec7..b3e6dca 100644 (file)
--- a/lib/ext2fs/blknum.c
+++ b/lib/ext2fs/blknum.c
@@ -49,7 +49,7 @@ blk64_t ext2fs_inode_data_blocks2(ext2_filsys fs,
                                        struct ext2_inode *inode)
 {
        return (inode->i_blocks |
-               ((fs->super->s_feature_incompat &
+               ((fs->super->s_feature_ro_compat &
                  EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ?
                 (__u64) inode->osd2.linux2.l_i_blocks_hi << 32 : 0)) -
                (inode->i_file_acl ? fs->blocksize >> 9 : 0);
@@ -62,7 +62,7 @@ blk64_t ext2fs_inode_i_blocks(ext2_filsys fs,
                                        struct ext2_inode *inode)
 {
        return (inode->i_blocks |
-               ((fs->super->s_feature_incompat & 
+               ((fs->super->s_feature_ro_compat &
                  EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ?
                 (__u64)inode->osd2.linux2.l_i_blocks_hi << 32 : 0));
 }
@@ -164,7 +164,7 @@ void ext2fs_free_blocks_count_add(struct ext2_super_block *super, blk64_t blk)
  * do the swap there.
  */
 struct ext2_group_desc *ext2fs_group_desc(ext2_filsys fs,
-                                         struct ext2_group_desc *gdp,
+                                         struct opaque_ext2_group_desc *gdp,
                                          dgrp_t group)
 {
        if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT)
@@ -174,22 +174,26 @@ struct ext2_group_desc *ext2fs_group_desc(ext2_filsys fs,
                return (struct ext2_group_desc *) gdp + group;
 }
 
+/* Do the same but as an ext4 group desc for internal use here */
+static struct ext4_group_desc *ext4fs_group_desc(ext2_filsys fs,
+                                         struct opaque_ext2_group_desc *gdp,
+                                         dgrp_t group)
+{
+       return (struct ext4_group_desc *)ext2fs_group_desc(fs, gdp, group);
+}
+
 /*
  * Return the block bitmap block of a group
  */
 blk64_t ext2fs_block_bitmap_loc(ext2_filsys fs, dgrp_t group)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-
-               return gdp->bg_block_bitmap |
-                       (fs->super->s_feature_incompat
-                        & EXT4_FEATURE_INCOMPAT_64BIT ?
-                        (__u64) gdp->bg_block_bitmap_hi << 32 : 0);
-       }
+       struct ext4_group_desc *gdp;
 
-       return fs->group_desc[group].bg_block_bitmap;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       return gdp->bg_block_bitmap |
+               (fs->super->s_feature_incompat
+                & EXT4_FEATURE_INCOMPAT_64BIT ?
+                (__u64)gdp->bg_block_bitmap_hi << 32 : 0);
 }
 
 /*
@@ -197,14 +201,12 @@ blk64_t ext2fs_block_bitmap_loc(ext2_filsys fs, dgrp_t group)
  */
 void ext2fs_block_bitmap_loc_set(ext2_filsys fs, dgrp_t group, blk64_t blk)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-               gdp->bg_block_bitmap = blk;
-               if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
-                       gdp->bg_block_bitmap_hi = (__u64) blk >> 32;
-       } else
-               fs->group_desc[group].bg_block_bitmap = blk;
+       struct ext4_group_desc *gdp;
+
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       gdp->bg_block_bitmap = blk;
+       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+               gdp->bg_block_bitmap_hi = (__u64) blk >> 32;
 }
 
 /*
@@ -212,17 +214,13 @@ void ext2fs_block_bitmap_loc_set(ext2_filsys fs, dgrp_t group, blk64_t blk)
  */
 blk64_t ext2fs_inode_bitmap_loc(ext2_filsys fs, dgrp_t group)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-
-               return gdp->bg_inode_bitmap |
-                       (fs->super->s_feature_incompat
-                        & EXT4_FEATURE_INCOMPAT_64BIT ?
-                        (__u64) gdp->bg_inode_bitmap_hi << 32 : 0);
-       }
+       struct ext4_group_desc *gdp;
 
-       return fs->group_desc[group].bg_inode_bitmap;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       return gdp->bg_inode_bitmap |
+               (fs->super->s_feature_incompat
+                & EXT4_FEATURE_INCOMPAT_64BIT ?
+                (__u64) gdp->bg_inode_bitmap_hi << 32 : 0);
 }
 
 /*
@@ -230,14 +228,12 @@ blk64_t ext2fs_inode_bitmap_loc(ext2_filsys fs, dgrp_t group)
  */
 void ext2fs_inode_bitmap_loc_set(ext2_filsys fs, dgrp_t group, blk64_t blk)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-               gdp->bg_inode_bitmap = blk;
-               if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
-                       gdp->bg_inode_bitmap_hi = (__u64) blk >> 32;
-       } else
-               fs->group_desc[group].bg_inode_bitmap = blk;
+       struct ext4_group_desc *gdp;
+
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       gdp->bg_inode_bitmap = blk;
+       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+               gdp->bg_inode_bitmap_hi = (__u64) blk >> 32;
 }
 
 /*
@@ -245,17 +241,13 @@ void ext2fs_inode_bitmap_loc_set(ext2_filsys fs, dgrp_t group, blk64_t blk)
  */
 blk64_t ext2fs_inode_table_loc(ext2_filsys fs, dgrp_t group)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-
-               return gdp->bg_inode_table |
-                       (fs->super->s_feature_incompat
-                        & EXT4_FEATURE_INCOMPAT_64BIT ?
-                        (__u64) gdp->bg_inode_table_hi << 32 : 0);
-       }
+       struct ext4_group_desc *gdp;
 
-       return fs->group_desc[group].bg_inode_table;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       return gdp->bg_inode_table |
+               (fs->super->s_feature_incompat
+                & EXT4_FEATURE_INCOMPAT_64BIT ?
+                (__u64) gdp->bg_inode_table_hi << 32 : 0);
 }
 
 /*
@@ -263,14 +255,12 @@ blk64_t ext2fs_inode_table_loc(ext2_filsys fs, dgrp_t group)
  */
 void ext2fs_inode_table_loc_set(ext2_filsys fs, dgrp_t group, blk64_t blk)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-               gdp->bg_inode_table = blk;
-               if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
-                       gdp->bg_inode_table_hi = (__u64) blk >> 32;
-       } else
-               fs->group_desc[group].bg_inode_table = blk;
+       struct ext4_group_desc *gdp;
+
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       gdp->bg_inode_table = blk;
+       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+               gdp->bg_inode_table_hi = (__u64) blk >> 32;
 }
 
 /*
@@ -278,17 +268,13 @@ void ext2fs_inode_table_loc_set(ext2_filsys fs, dgrp_t group, blk64_t blk)
  */
 __u32 ext2fs_bg_free_blocks_count(ext2_filsys fs, dgrp_t group)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-
-               return gdp->bg_free_blocks_count |
-                       (fs->super->s_feature_incompat
-                        & EXT4_FEATURE_INCOMPAT_64BIT ?
-                        (__u32) gdp->bg_free_blocks_count_hi << 16 : 0);
-       }
+       struct ext4_group_desc *gdp;
 
-       return fs->group_desc[group].bg_free_blocks_count;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       return gdp->bg_free_blocks_count |
+               (fs->super->s_feature_incompat
+                & EXT4_FEATURE_INCOMPAT_64BIT ?
+                (__u32) gdp->bg_free_blocks_count_hi << 16 : 0);
 }
 
 /*
@@ -296,14 +282,13 @@ __u32 ext2fs_bg_free_blocks_count(ext2_filsys fs, dgrp_t group)
  */
 void ext2fs_bg_free_blocks_count_set(ext2_filsys fs, dgrp_t group, __u32 n)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-               gdp->bg_free_blocks_count = n;
-               if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
-                       gdp->bg_free_blocks_count_hi = (__u32) n >> 16;
-       } else
-               fs->group_desc[group].bg_free_blocks_count = n;
+       struct ext4_group_desc *gdp;
+
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       gdp->bg_free_blocks_count = n;
+
+       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+               gdp->bg_free_blocks_count_hi = (__u32) n >> 16;
 }
 
 /*
@@ -311,17 +296,13 @@ void ext2fs_bg_free_blocks_count_set(ext2_filsys fs, dgrp_t group, __u32 n)
  */
 __u32 ext2fs_bg_free_inodes_count(ext2_filsys fs, dgrp_t group)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-
-               return gdp->bg_free_inodes_count |
-                       (fs->super->s_feature_incompat
-                        & EXT4_FEATURE_INCOMPAT_64BIT ?
-                        (__u32) gdp->bg_free_inodes_count_hi << 16 : 0);
-       }
+       struct ext4_group_desc *gdp;
 
-       return fs->group_desc[group].bg_free_inodes_count;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       return gdp->bg_free_inodes_count |
+               (fs->super->s_feature_incompat
+                & EXT4_FEATURE_INCOMPAT_64BIT ?
+                (__u32) gdp->bg_free_inodes_count_hi << 16 : 0);
 }
 
 /*
@@ -329,14 +310,12 @@ __u32 ext2fs_bg_free_inodes_count(ext2_filsys fs, dgrp_t group)
  */
 void ext2fs_bg_free_inodes_count_set(ext2_filsys fs, dgrp_t group, __u32 n)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-               gdp->bg_free_inodes_count = n;
-               if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
-                       gdp->bg_free_inodes_count_hi = (__u32) n >> 16;
-       } else
-               fs->group_desc[group].bg_free_inodes_count = n;
+       struct ext4_group_desc *gdp;
+
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       gdp->bg_free_inodes_count = n;
+       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+               gdp->bg_free_inodes_count_hi = (__u32) n >> 16;
 }
 
 /*
@@ -344,17 +323,13 @@ void ext2fs_bg_free_inodes_count_set(ext2_filsys fs, dgrp_t group, __u32 n)
  */
 __u32 ext2fs_bg_used_dirs_count(ext2_filsys fs, dgrp_t group)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-
-               return gdp->bg_used_dirs_count |
-                       (fs->super->s_feature_incompat
-                        & EXT4_FEATURE_INCOMPAT_64BIT ?
-                        (__u32) gdp->bg_used_dirs_count_hi << 16 : 0);
-       }
+       struct ext4_group_desc *gdp;
 
-       return fs->group_desc[group].bg_used_dirs_count;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       return gdp->bg_used_dirs_count |
+               (fs->super->s_feature_incompat
+                & EXT4_FEATURE_INCOMPAT_64BIT ?
+                (__u32) gdp->bg_used_dirs_count_hi << 16 : 0);
 }
 
 /*
@@ -362,14 +337,12 @@ __u32 ext2fs_bg_used_dirs_count(ext2_filsys fs, dgrp_t group)
  */
 void ext2fs_bg_used_dirs_count_set(ext2_filsys fs, dgrp_t group, __u32 n)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-               gdp->bg_used_dirs_count = n;
-               if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
-                       gdp->bg_used_dirs_count_hi = (__u32) n >> 16;
-       } else
-               fs->group_desc[group].bg_used_dirs_count = n;
+       struct ext4_group_desc *gdp;
+
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       gdp->bg_used_dirs_count = n;
+       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+               gdp->bg_used_dirs_count_hi = (__u32) n >> 16;
 }
 
 /*
@@ -377,17 +350,13 @@ void ext2fs_bg_used_dirs_count_set(ext2_filsys fs, dgrp_t group, __u32 n)
  */
 __u32 ext2fs_bg_itable_unused(ext2_filsys fs, dgrp_t group)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-
-               return gdp->bg_itable_unused |
-                       (fs->super->s_feature_incompat
-                        & EXT4_FEATURE_INCOMPAT_64BIT ?
-                        (__u32) gdp->bg_itable_unused_hi << 16 : 0);
-       }
+       struct ext4_group_desc *gdp;
 
-       return fs->group_desc[group].bg_itable_unused;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       return gdp->bg_itable_unused |
+               (fs->super->s_feature_incompat
+                & EXT4_FEATURE_INCOMPAT_64BIT ?
+                (__u32) gdp->bg_itable_unused_hi << 16 : 0);
 }
 
 /*
@@ -395,14 +364,12 @@ __u32 ext2fs_bg_itable_unused(ext2_filsys fs, dgrp_t group)
  */
 void ext2fs_bg_itable_unused_set(ext2_filsys fs, dgrp_t group, __u32 n)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-               gdp->bg_itable_unused = n;
-               if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
-                       gdp->bg_itable_unused_hi = (__u32) n >> 16;
-       } else
-               fs->group_desc[group].bg_itable_unused = n;
+       struct ext4_group_desc *gdp;
+
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       gdp->bg_itable_unused = n;
+       if (fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_64BIT)
+               gdp->bg_itable_unused_hi = (__u32) n >> 16;
 }
 
 /*
@@ -410,93 +377,57 @@ void ext2fs_bg_itable_unused_set(ext2_filsys fs, dgrp_t group, __u32 n)
  */
 __u16 ext2fs_bg_flags(ext2_filsys fs, dgrp_t group)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-
-               return gdp->bg_flags;
-       }
-
-       return fs->group_desc[group].bg_flags;
-}
-
-/*
- * Set the flags for this block group
- */
-void ext2fs_bg_flags_set(ext2_filsys fs, dgrp_t group, __u16 bg_flags)
-{
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
+       struct ext4_group_desc *gdp;
 
-               gdp->bg_flags = bg_flags;
-               return;
-       }
-
-       fs->group_desc[group].bg_flags = bg_flags;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       return gdp->bg_flags;
 }
 
 /*
- * Clear the flags for this block group
+ * Zero out the flags for this block group
  */
-void ext2fs_bg_flags_clear(ext2_filsys fs, dgrp_t group, __u16 bg_flags)
+void ext2fs_bg_flags_zap(ext2_filsys fs, dgrp_t group)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-
-               gdp->bg_flags = 0;
-               return;
-       }
+       struct ext4_group_desc *gdp;
 
-       fs->group_desc[group].bg_flags = 0;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       gdp->bg_flags = 0;
+       return;
 }
 
 /*
  * Get the value of a particular flag for this block group
  */
-int ext2fs_bg_flag_test(ext2_filsys fs, dgrp_t group, __u16 bg_flag)
+int ext2fs_bg_flags_test(ext2_filsys fs, dgrp_t group, __u16 bg_flag)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
+       struct ext4_group_desc *gdp;
 
-               return gdp->bg_flags & bg_flag;
-       }
-
-       return fs->group_desc[group].bg_flags & bg_flag;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       return gdp->bg_flags & bg_flag;
 }
 
 /*
- * Set a particular flag for this block group
+ * Set a flag or set of flags for this block group
  */
-void ext2fs_bg_flag_set(ext2_filsys fs, dgrp_t group, __u16 bg_flag)
+void ext2fs_bg_flags_set(ext2_filsys fs, dgrp_t group, __u16 bg_flags)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
+       struct ext4_group_desc *gdp;
 
-               gdp->bg_flags |= bg_flag;
-               return;
-       }
-
-       fs->group_desc[group].bg_flags |= bg_flag;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       gdp->bg_flags |= bg_flags;
+       return;
 }
 
 /*
- * Clear a particular flag for this block group
+ * Clear a flag or set of flags for this block group
  */
-void ext2fs_bg_flag_clear(ext2_filsys fs, dgrp_t group, __u16 bg_flag)
+void ext2fs_bg_flags_clear(ext2_filsys fs, dgrp_t group, __u16 bg_flags)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
+       struct ext4_group_desc *gdp;
 
-               gdp->bg_flags &= ~bg_flag;
-               return;
-       }
-
-       fs->group_desc[group].bg_flags &= ~bg_flag;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       gdp->bg_flags &= ~bg_flags;
+       return;
 }
 
 /*
@@ -504,14 +435,10 @@ void ext2fs_bg_flag_clear(ext2_filsys fs, dgrp_t group, __u16 bg_flag)
  */
 __u16 ext2fs_bg_checksum(ext2_filsys fs, dgrp_t group)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-
-               return gdp->bg_checksum;
-       }
+       struct ext4_group_desc *gdp;
 
-       return fs->group_desc[group].bg_checksum;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       return gdp->bg_checksum;
 }
 
 /*
@@ -519,15 +446,11 @@ __u16 ext2fs_bg_checksum(ext2_filsys fs, dgrp_t group)
  */
 void ext2fs_bg_checksum_set(ext2_filsys fs, dgrp_t group, __u16 checksum)
 {
-       if (fs->super->s_desc_size >= EXT2_MIN_DESC_SIZE_64BIT) {
-               struct ext4_group_desc *gdp;
-               gdp = (struct ext4_group_desc *) (fs->group_desc) + group;
-               
-               gdp->bg_checksum = checksum;
-               return;
-       }
+       struct ext4_group_desc *gdp;
 
-       fs->group_desc[group].bg_checksum = checksum;
+       gdp = ext4fs_group_desc(fs, fs->group_desc, group);
+       gdp->bg_checksum = checksum;
+       return;
 }
 
 /*
Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git