aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2020-01-01 21:50:27 -0500
committerTheodore Ts'o <tytso@mit.edu>2020-01-01 21:50:27 -0500
commitc52d930f3ffbc19fa248d53daa171436ac391bb5 (patch)
treea84db3685ce8f369592e42898a95a5399fdc6688
parente7c22958b31f65bff3620d9d8154c78b56e4ee35 (diff)
downloade2fsprogs-c52d930f3ffbc19fa248d53daa171436ac391bb5.tar.gz
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>
-rw-r--r--e2fsck/super.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/e2fsck/super.c b/e2fsck/super.c
index e5932be60..18affcf72 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;