From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 2 Jan 2020 02:50:27 +0000 (-0500)
Subject: e2fsck: don't check for future superblock times if checkinterval == 0
X-Git-Tag: v1.45.5~5
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=c52d930f3ffbc19fa248d53daa171436ac391bb5;p=tools%2Fe2fsprogs.git

e2fsck: don't check for future superblock times if checkinterval == 0

We are no longer enabling periodic file system checks by default in
mke2fs.  The only reason why we force file system checks if the last
mount time or last write time in the superblock is if this might
bypass the periodic file systme checks.  So if the checkinterval is
zero, skip the last mount/write time checks since there's no reason to
force a check just because the system clock is incorrect.

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

diff --git a/e2fsck/super.c b/e2fsck/super.c
index e5932be..18affcf 100644
--- a/e2fsck/super.c
+++ b/e2fsck/super.c
@@ -1038,7 +1038,7 @@ void check_super_block(e2fsck_t ctx)
 	 * Check to see if the superblock last mount time or last
 	 * write time is in the future.
 	 */
-	if (!broken_system_clock &&
+	if (!broken_system_clock && fs->super->s_checkinterval &&
 	    !(ctx->flags & E2F_FLAG_TIME_INSANE) &&
 	    fs->super->s_mtime > (__u32) ctx->now) {
 		pctx.num = fs->super->s_mtime;
@@ -1050,7 +1050,7 @@ void check_super_block(e2fsck_t ctx)
 			fs->flags |= EXT2_FLAG_DIRTY;
 		}
 	}
-	if (!broken_system_clock &&
+	if (!broken_system_clock && fs->super->s_checkinterval &&
 	    !(ctx->flags & E2F_FLAG_TIME_INSANE) &&
 	    fs->super->s_wtime > (__u32) ctx->now) {
 		pctx.num = fs->super->s_wtime;