From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 18 May 2010 02:54:06 +0000 (-0400)
Subject: e2fsck: Don't set the group descriptor checksums if the fsck was cancelled
X-Git-Tag: v1.41.12~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e6436d459307af8d6be6fb0da6ab24860d8e677;p=thirdparty%2Fe2fsprogs.git

e2fsck: Don't set the group descriptor checksums if the fsck was cancelled

It's a bad idea to set the checksums if e2fsck is aborted by the user,
and it often causes an error message, "Inode bitmap not loaded while
setting block group checksum info".

Addresses-Launchpad-Bug: #582035

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 383c651f8..be165011b 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -1445,7 +1445,8 @@ no_journal:
 		}
 	}
 
-	if (sb->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_GDT_CSUM &&
+	if ((run_result & E2F_FLAG_CANCEL) == 0 &&
+	    sb->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_GDT_CSUM &&
 	    !(ctx->options & E2F_OPT_READONLY)) {
 		retval = ext2fs_set_gdt_csum(ctx->fs);
 		if (retval) {