From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 24 Feb 2018 23:11:19 +0000 (-0500)
Subject: tune2fs/fuse2fs/debugfs: after replaying the journal, fix up s_lastcheck
X-Git-Tag: debian/1.44.4-1~12^2~3
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=60f032bbc16772a12953ce7f6102609b9e452554;p=tools%2Fe2fsprogs.git

tune2fs/fuse2fs/debugfs: after replaying the journal, fix up s_lastcheck

If the file system needs to have the journal replayed, but definition
it can't be freshly checked.  So if the time when the file system was
last checked (s_lastcheck) is before the time it was last mounted
(s_mtime), force s_lastcheck to be before s_mtime.

This is necessary to make sure some of tune2fs's safety checks work
correctly after replaying the journal, since some of tune2fs's
operations really require that the file system be self-consistent or
grave damage can result.

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

diff --git a/debugfs/journal.c b/debugfs/journal.c
index 56a68be..c16daa5 100644
--- a/debugfs/journal.c
+++ b/debugfs/journal.c
@@ -250,6 +250,12 @@ static void ext2fs_clear_recover(ext2_filsys fs, int error)
 	/* if we had an error doing journal recovery, we need a full fsck */
 	if (error)
 		fs->super->s_state &= ~EXT2_VALID_FS;
+	/*
+	 * If we replayed the journal by definition the file system
+	 * was mounted since the last time it was checked
+	 */
+	if (fs->super->s_lastcheck >= fs->super->s_mtime)
+		fs->super->s_lastcheck = fs->super->s_mtime - 1;
 	ext2fs_mark_super_dirty(fs);
 }