linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <djwong@us.ibm.com>
To: Andreas Dilger <adilger.kernel@dilger.ca>,
	Theodore Tso <tytso@mit.edu>,
	"Darrick J. Wong" <djwong@us.ibm.com>
Cc: Sunil Mushran <sunil.mushran@oracle.com>,
	Amir Goldstein <amir73il@gmail.com>,
	Andi Kleen <andi@firstfloor.org>, Mingming Cao <cmm@us.ibm.com>,
	Joel Becker <jlbec@evilplan.org>,
	linux-ext4@vger.kernel.org, Coly Li <colyli@gmail.com>
Subject: [PATCH 40/47] e2fsck: Verify and correct MMP checksum problems
Date: Sat, 08 Oct 2011 00:37:32 -0700	[thread overview]
Message-ID: <20111008073732.17888.23812.stgit@elm3c44.beaverton.ibm.com> (raw)
In-Reply-To: <20111008073315.17888.22132.stgit@elm3c44.beaverton.ibm.com>

Check and handle MMP checksum problems by resetting the block.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---
 e2fsck/problem.c |    5 +++++
 e2fsck/problem.h |    3 +++
 e2fsck/unix.c    |    5 +++++
 3 files changed, 13 insertions(+), 0 deletions(-)


diff --git a/e2fsck/problem.c b/e2fsck/problem.c
index 76a13de..f0b92ec 100644
--- a/e2fsck/problem.c
+++ b/e2fsck/problem.c
@@ -428,6 +428,11 @@ static struct e2fsck_problem problem_table[] = {
 	  N_("@S has invalid MMP magic.  "),
 	  PROMPT_FIX, PR_PREEN_OK | PR_NO_OK},
 
+	/* Superblock has invalid MMP checksum. */
+	{ PR_0_MMP_CSUM_INVALID,
+	  N_("@S has invalid MMP checksum.  "),
+	  PROMPT_FIX, PR_PREEN_OK | PR_NO_OK},
+
 	/* Pass 1 errors */
 
 	/* Pass 1: Checking inodes, blocks, and sizes */
diff --git a/e2fsck/problem.h b/e2fsck/problem.h
index fdb7f99..da6cd64 100644
--- a/e2fsck/problem.h
+++ b/e2fsck/problem.h
@@ -242,6 +242,9 @@ struct problem_context {
 /* Superblock has invalid MMP magic. */
 #define PR_0_MMP_INVALID_MAGIC			0x000043
 
+/* Superblock has invalid MMP checksum. */
+#define PR_0_MMP_CSUM_INVALID			0x000044
+
 
 /*
  * Pass 1 errors
diff --git a/e2fsck/unix.c b/e2fsck/unix.c
index 1d81762..423cc27 100644
--- a/e2fsck/unix.c
+++ b/e2fsck/unix.c
@@ -1084,6 +1084,11 @@ check_error:
 			ext2fs_mmp_clear(fs);
 			retval = 0;
 		}
+	} else if (retval == EXT2_ET_MMP_CSUM_INVALID) {
+		if (fix_problem(ctx, PR_0_MMP_CSUM_INVALID, &pctx)) {
+			ext2fs_mmp_clear(fs);
+			retval = 0;
+		}
 	}
 	return retval;
 }


  parent reply	other threads:[~2011-10-08  7:39 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-08  7:33 [PATCH v2 00/47] e2fsprogs: Add metadata checksumming Darrick J. Wong
2011-10-08  7:33 ` [PATCH 01/47] libext2fs: Read and write full size inodes Darrick J. Wong
2011-10-08  7:33 ` [PATCH 02/47] libext2fs: Add metadata checksum flag Darrick J. Wong
2011-10-08  7:33 ` [PATCH 03/47] debugfs: Optionally ignore bad checksums Darrick J. Wong
2011-10-08  7:33 ` [PATCH 04/47] libext2fs: Add inode checksum support Darrick J. Wong
2011-10-08  7:33 ` [PATCH 05/47] debugfs: Dump inode checksum when appropriate Darrick J. Wong
2011-10-08  7:33 ` [PATCH 06/47] tune2fs: Add inode checksum support Darrick J. Wong
2011-10-08  7:34 ` [PATCH 07/47] e2fsck: Verify and correct inode checksums Darrick J. Wong
2011-10-08  7:34 ` [PATCH 08/47] mke2fs: Allow metadata checksums to be turned on at mkfs time Darrick J. Wong
2011-10-08  7:34 ` [PATCH 09/47] libext2fs: Create the inode bitmap checksum Darrick J. Wong
2011-10-08  7:34 ` [PATCH 10/47] tune2fs: Rewrite inode bitmap checksums Darrick J. Wong
2011-10-08  7:34 ` [PATCH 11/47] dumpe2fs: Display inode bitmap checksum Darrick J. Wong
2011-10-08  7:34 ` [PATCH 12/47] e2fsck: Verify " Darrick J. Wong
2011-10-08  7:34 ` [PATCH 13/47] libext2fs: Create the block " Darrick J. Wong
2011-10-08  7:34 ` [PATCH 14/47] dumpe2fs: Display " Darrick J. Wong
2011-10-08  7:34 ` [PATCH 15/47] e2fsck: Verify " Darrick J. Wong
2011-10-08  7:34 ` [PATCH 16/47] e2fsck: Don't verify bitmap checksums Darrick J. Wong
2011-10-08  7:35 ` [PATCH 17/47] tune2fs: Rewrite block " Darrick J. Wong
2011-10-08  7:35 ` [PATCH 18/47] libext2fs: Verify and calculate extent tree block checksums Darrick J. Wong
2011-10-08  7:35 ` [PATCH 19/47] tune2fs: Enable extent tree checksums Darrick J. Wong
2011-10-08  7:35 ` [PATCH 20/47] libext2fs: Introduce dx_tail and dir_entry_tail Darrick J. Wong
2011-10-08  7:35 ` [PATCH 21/47] debugfs: Print htree internal node checksums Darrick J. Wong
2011-10-08  7:35 ` [PATCH 22/47] libext2fs: Add dx_root/dx_node checksum calculation and verification helpers Darrick J. Wong
2011-10-08  7:35 ` [PATCH 23/47] e2fsck: Verify htree root/node checksums Darrick J. Wong
2011-10-08  7:35 ` [PATCH 24/47] libext2fs: Introduce dir_entry_tail to provide checksums for directory leaf nodes Darrick J. Wong
2011-10-08  7:35 ` [PATCH 25/47] e2fsck: Check directory leaf block checksums Darrick J. Wong
2011-10-08  7:36 ` [PATCH 26/47] tune2fs: Rebuild and checksum directories when toggling metadata_csum or changing UUID Darrick J. Wong
2011-10-08  7:36 ` [PATCH 27/47] libext2fs: Verify and calculate extended attribute block checksums Darrick J. Wong
2011-10-08  7:36 ` [PATCH 28/47] e2fsck: Check " Darrick J. Wong
2011-10-08  7:36 ` [PATCH 29/47] tune2fs: Rewrite " Darrick J. Wong
2011-10-08  7:36 ` [PATCH 30/47] libext2fs: Calculate and verify superblock checksums Darrick J. Wong
2011-10-08  7:36 ` [PATCH 31/47] e2fsck: Handle superblock checksum errors gracefully Darrick J. Wong
2011-10-08  7:36 ` [PATCH 32/47] libext2fs: Use i_generation in inode-related metadata checksums Darrick J. Wong
2011-10-08  7:36 ` [PATCH 33/47] libext2fs: Record the checksum algorithm in use in the superblock Darrick J. Wong
2011-10-08  7:36 ` [PATCH 34/47] tune2fs: Store checksum algorithm type in superblock Darrick J. Wong
2011-10-08  7:37 ` [PATCH 35/47] mke2fs: Record the checksum algorithm in use in the superblock Darrick J. Wong
2011-10-08  7:37 ` [PATCH 36/47] libext2fs: Block group checksum should use metadata_csum algorithm (if feature flag set) Darrick J. Wong
2011-10-08  7:37 ` [PATCH 37/47] tune2fs: Rewrite block group checksums when changing bg_use_meta_csum feature Darrick J. Wong
2011-10-08  7:37 ` [PATCH 38/47] mke2fs: Warn if not enabling all the features that metadata_csum wants Darrick J. Wong
2011-10-08  7:37 ` [PATCH 39/47] libext2fs: Add checksum to MMP block Darrick J. Wong
2011-10-08  7:37 ` Darrick J. Wong [this message]
2011-10-08  7:37 ` [PATCH 41/47] tune2fs: Force MMP update when changing metadata_csum flag Darrick J. Wong
2011-10-08  7:37 ` [PATCH 42/47] libext2fs: Add feature flags for jbd2 v2 checksums Darrick J. Wong
2011-10-08  7:37 ` [PATCH 43/47] e2fsck: Check journal superblock checksum prior to recovery Darrick J. Wong
2011-10-08  7:37 ` [PATCH 44/47] e2fsck: Check revoke block checksum during recovery Darrick J. Wong
2011-10-08  7:38 ` [PATCH 45/47] e2fsck: Check descriptor block checksum when recovering journal Darrick J. Wong
2011-10-08  7:38 ` [PATCH 46/47] e2fsck: Check commit block checksum during recovery Darrick J. Wong
2011-10-08  7:38 ` [PATCH 47/47] e2fsck: Verify data block checksums when recovering journal Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111008073732.17888.23812.stgit@elm3c44.beaverton.ibm.com \
    --to=djwong@us.ibm.com \
    --cc=adilger.kernel@dilger.ca \
    --cc=amir73il@gmail.com \
    --cc=andi@firstfloor.org \
    --cc=cmm@us.ibm.com \
    --cc=colyli@gmail.com \
    --cc=jlbec@evilplan.org \
    --cc=linux-ext4@vger.kernel.org \
    --cc=sunil.mushran@oracle.com \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).