From 254195627f052f09282f2cba37222b371ab47d60 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sat, 3 Sep 2016 23:33:11 -0400 Subject: [PATCH] e2fsck: fix timestamps logic for 32-bit systems Commit 35a4e1b1c5cbb introduced a regression which caused e2fsck on 32-bit systems to think all timestamps were legacy pre-1970 timestamps. Fix the bug. Signed-off-by: Theodore Ts'o --- e2fsck/pass1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 8623063..da0ddf4 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -512,9 +512,9 @@ static void check_inode_extra_space(e2fsck_t ctx, struct problem_context *pctx) * If the inode's extended atime (ctime, crtime, mtime) is stored in * the old, invalid format, repair it. */ - if ((sizeof(time_t) <= 4) || - (((sizeof(time_t) > 4) && - ctx->now < EXT4_EXTRA_NEGATIVE_DATE_CUTOFF)) && + if (((sizeof(time_t) <= 4) || + (((sizeof(time_t) > 4) && + ctx->now < EXT4_EXTRA_NEGATIVE_DATE_CUTOFF))) && (CHECK_INODE_EXTRA_NEGATIVE_EPOCH(inode, atime) || CHECK_INODE_EXTRA_NEGATIVE_EPOCH(inode, ctime) || CHECK_INODE_EXTRA_NEGATIVE_EPOCH(inode, crtime) || -- 1.8.3.1