From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 1 Oct 2020 21:13:27 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.46.0~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b8253ba09e635d328a48c98a184b571b809911b;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next
---

7b8253ba09e635d328a48c98a184b571b809911b
diff --cc misc/tune2fs.c
index 81f90cbf9,a481d8f31..f942c698a
--- a/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."));
+ 			if (rc)
+ 				goto closefs;
 -			rewrite_checksums = 1;
 +			rewrite_checksums = REWRITE_ALL;
  		}
  
  		if (ext2fs_has_group_desc_csum(fs)) {