From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Thu, 11 Dec 2014 22:48:03 +0000 (-0500)
Subject: e2fsck: force-reread of inode from disk when re-checking a checksum error
X-Git-Tag: v1.43-WIP-2015-05-18~125
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=250304879a689eb2e2d859e3646dbdbe3819236e;p=tools%2Fe2fsprogs.git

e2fsck: force-reread of inode from disk when re-checking a checksum error

When we're rechecking an inode checksum failure, we need to force the
inode to be re-read from disk so that the verification routine runs,
so drop the stashed inode.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index af64fd1..14877d7 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -663,6 +663,7 @@ static errcode_t recheck_bad_inode_checksum(ext2_filsys fs, ext2_ino_t ino,
 	 * Reread inode.  If we don't see checksum error, then this inode
 	 * has been fixed elsewhere.
 	 */
+	ctx->stashed_ino = 0;
 	retval = ext2fs_read_inode_full(fs, ino, (struct ext2_inode *)&inode,
 					sizeof(inode));
 	if (retval && retval != EXT2_ET_INODE_CSUM_INVALID)