From: "Darrick J. Wong" Subject: [PATCH 16/47] e2fsck: Don't verify bitmap checksums Date: Sat, 08 Oct 2011 00:34:57 -0700 Message-ID: <20111008073457.17888.73019.stgit@elm3c44.beaverton.ibm.com> References: <20111008073315.17888.22132.stgit@elm3c44.beaverton.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Cc: Sunil Mushran , Amir Goldstein , Andi Kleen , Mingming Cao , Joel Becker , linux-ext4@vger.kernel.org, Coly Li To: Andreas Dilger , Theodore Tso , "Darrick J. Wong" Return-path: Received: from e3.ny.us.ibm.com ([32.97.182.143]:40822 "EHLO e3.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751921Ab1JHHhs (ORCPT ); Sat, 8 Oct 2011 03:37:48 -0400 Received: from /spool/local by us.ibm.com with XMail ESMTP for from ; Sat, 8 Oct 2011 03:37:47 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p987Z0to232104 for ; Sat, 8 Oct 2011 03:35:00 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p987YxMQ007226 for ; Sat, 8 Oct 2011 03:35:00 -0400 In-Reply-To: <20111008073315.17888.22132.stgit@elm3c44.beaverton.ibm.com> Sender: linux-ext4-owner@vger.kernel.org List-ID: Since the correct inode and block bitmaps are calculated in pass 5, don't fail the bitmap read operation in prior passes since (a) incorrect results won't kill us and (b) if we fail early, we'll never _get_ to pass 5. Signed-off-by: Darrick J. Wong --- e2fsck/util.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/e2fsck/util.c b/e2fsck/util.c index 06daf12..218e566 100644 --- a/e2fsck/util.c +++ b/e2fsck/util.c @@ -227,7 +227,9 @@ void e2fsck_read_bitmaps(e2fsck_t ctx) } old_op = ehandler_operation(_("reading inode and block bitmaps")); + ctx->fs->flags |= EXT2_FLAG_IGNORE_CSUM_ERRORS; retval = ext2fs_read_bitmaps(fs); + ctx->fs->flags &= ~EXT2_FLAG_IGNORE_CSUM_ERRORS; ehandler_operation(old_op); if (retval) { com_err(ctx->program_name, retval,