Merge branch 'maint' into next

Conflicts:
	resize/resize2fs.c

diff --cc e2fsck/super.c
Simple merge

diff --cc lib/ext2fs/alloc.c
Simple merge

diff --cc lib/ext2fs/extent.c
Simple merge

diff --cc resize/resize2fs.c
index 56a08c5,8fdf35c..8ef6513
--- 1/resize/resize2fs.c
--- 2/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@@ -185,11 -215,12 +215,11 @@@ errout
   */
  static void fix_uninit_block_bitmaps(ext2_filsys fs)
  {
-       blk64_t         i, blk, super_blk, old_desc_blk, new_desc_blk;
-       int             old_desc_blocks;
+       blk64_t         blk, lblk;
        dgrp_t          g;
+       int             i;
  
 -      if (!(EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
 -                                       EXT4_FEATURE_RO_COMPAT_GDT_CSUM)))
 +      if (!ext2fs_has_group_desc_csum(fs))
                return;
  
        for (g=0; g < fs->group_desc_count; g++) {
@@@ -476,10 -492,10 +491,9 @@@ retry
        /*
         * Initialize the new block group descriptors
         */
-       group_block = fs->super->s_first_data_block +
-               old_fs->group_desc_count * fs->super->s_blocks_per_group;
- 
+       group_block = ext2fs_group_first_block2(fs,
+                                               old_fs->group_desc_count);
 -      csum_flag = EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
 -                                             EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
 +      csum_flag = ext2fs_has_group_desc_csum(fs);
        if (access("/sys/fs/ext4/features/lazy_itable_init", F_OK) == 0)
                lazy_itable_init = 1;
        if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)