Merge branch 'maint' into next

Conflicts:
	e2fsck/unix.c

diff --cc e2fsck/problem.c
Simple merge

diff --cc e2fsck/problem.h
index e901c8e,212ed35..5c92d0a
--- 1/e2fsck/problem.h
--- 2/e2fsck/problem.h
+++ b/e2fsck/problem.h
@@@ -249,18 -249,11 +249,20 @@@ struct problem_context 
  /* Checking group descriptor failed */
  #define PR_0_CHECK_DESC_FAILED                        0x000045
  
- /* 64bit is set but extents are not set. */
- #define PR_0_64BIT_WITHOUT_EXTENTS            0x000048
- 
 +/*
 + * metadata_csum supersedes uninit_bg; both feature bits cannot be set
 + * simultaneously.
 + */
 +#define PR_0_META_AND_GDT_CSUM_SET            0x000046
 +
 +/* Superblock has invalid MMP checksum. */
 +#define PR_0_MMP_CSUM_INVALID                 0x000047
 +
+ /* 64bit is set but extents are not set. */
+ #define PR_0_64BIT_WITHOUT_EXTENTS            0x000048
+ 
+ /* The first_meta_bg is too big */
+ #define PR_0_FIRST_META_BG_TOO_BIG            0x000049
  
  /*
   * Pass 1 errors

diff --cc e2fsck/super.c
Simple merge

diff --cc e2fsck/unix.c
Simple merge

diff --cc lib/ext2fs/closefs.c
index e7ec0ae,1f99113..4f2f195
--- 1/lib/ext2fs/closefs.c
--- 2/lib/ext2fs/closefs.c
+++ b/lib/ext2fs/closefs.c
@@@ -362,14 -344,15 +362,16 @@@ errcode_t ext2fs_flush2(ext2_filsys fs
         * superblocks and group descriptors.
         */
        group_ptr = (char *) group_shadow;
-       if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
+       if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) {
                old_desc_blocks = fs->super->s_first_meta_bg;
-       else
+               if (old_desc_blocks > fs->super->s_first_meta_bg)
+                       old_desc_blocks = fs->desc_blocks;
+       } else
                old_desc_blocks = fs->desc_blocks;
  
 -      ext2fs_numeric_progress_init(fs, &progress, NULL,
 -                                   fs->group_desc_count);
 +      if (fs->progress_ops && fs->progress_ops->init)
 +              (fs->progress_ops->init)(fs, &progress, NULL,
 +                                       fs->group_desc_count);
  
  
        for (i = 0; i < fs->group_desc_count; i++) {

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

diff --cc resize/resize2fs.c
Simple merge