Merge branch 'maint' into next

diff --cc configure.ac
Simple merge

diff --cc debugfs/debugfs.c
Simple merge

diff --cc e2fsck/e2fsck.h
Simple merge

diff --cc e2fsck/pass1.c
Simple merge

diff --cc e2fsck/unix.c
Simple merge

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

diff --cc lib/ext2fs/ext2_fs.h
Simple merge

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

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

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

diff --cc misc/mke2fs.c
Simple merge

diff --cc misc/tune2fs.c
index 81f90cb,a481d8f..f942c69
--- 1/misc/tune2fs.c
--- 2/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@@ -1320,9 -1274,9 +1324,9 @@@ mmp_error
                if (mount_flags & EXT2_MF_MOUNTED) {
                        fputs(_("Cannot disable metadata_csum on a mounted "
                                "filesystem!\n"), stderr);
-                       exit(1);
+                       return 1;
                }
 -              rewrite_checksums = 1;
 +              rewrite_checksums = REWRITE_ALL;
  
                /* Enable uninit_bg unless the user expressly turned it off */
                memcpy(test_features, old_features, sizeof(test_features));
@@@ -1502,9 -1456,10 +1506,10 @@@
                                      stderr);
                                return 1;
                        }
-                       check_fsck_needed(fs, _("Recalculating checksums "
-                                               "could take some time."));
+                       if (check_fsck_needed(fs, _("Recalculating checksums "
 -                                                   "could take some time.")))
++                                                  "could take some time.")))
+                               return 1;
 -                      rewrite_checksums = 1;
 +                      rewrite_checksums = REWRITE_ALL;
                }
        }
  
@@@ -3245,10 -3197,12 +3254,12 @@@ _("Warning: The journal is dirty. You m
                if (!ext2fs_has_feature_csum_seed(fs->super) &&
                    (ext2fs_has_feature_metadata_csum(fs->super) ||
                     ext2fs_has_feature_ea_inode(fs->super))) {
-                       check_fsck_needed(fs,
+                       rc = check_fsck_needed(fs,
                                _("Setting the UUID on this "
                                  "filesystem could take some time."));
 -                      rewrite_checksums = 1;
+                       if (rc)
+                               goto closefs;
 +                      rewrite_checksums = REWRITE_ALL;
                }
  
                if (ext2fs_has_group_desc_csum(fs)) {