linux-fsdevel.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>,
	Martin K Petersen <martin.petersen@oracle.com>,
	Greg Freemyer <greg.freemyer@gmail.com>,
	Amir Goldstein <amir73il@gmail.com>,
	linux-kernel <linux-kernel@vger.kernel.org>,
	Andi Kleen <andi@firstfloor.org>, Mingming Cao <cmm@us.ibm.com>,
	Joel Becker <jlbec@evilplan.org>,
	linux-fsdevel <linux-fsdevel@vger.kernel.org>,
	linux-ext4@vger.kernel.org, Coly Li <colyli@gmail.com>
Subject: [PATCH 08/28] ext4: Record the checksum algorithm in use in the superblock
Date: Sat, 08 Oct 2011 00:54:36 -0700	[thread overview]
Message-ID: <20111008075436.20506.63897.stgit@elm3c44.beaverton.ibm.com> (raw)
In-Reply-To: <20111008075343.20506.23155.stgit@elm3c44.beaverton.ibm.com>

Record the type of checksum algorithm we're using for metadata in the
superblock, in case we ever want/need to change the algorithm.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
---
 fs/ext4/ext4.h  |    5 ++++-
 fs/ext4/super.c |   18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletions(-)


diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 8ee8646..a74e125 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -957,6 +957,9 @@ extern void ext4_set_bits(void *bm, int cur, int len);
 #define EXT4_ERRORS_PANIC		3	/* Panic */
 #define EXT4_ERRORS_DEFAULT		EXT4_ERRORS_CONTINUE
 
+/* Metadata checksum algorithm codes */
+#define EXT4_CRC32C_CHKSUM		1
+
 /*
  * Structure of the super block
  */
@@ -1043,7 +1046,7 @@ struct ext4_super_block {
 	__le64  s_mmp_block;            /* Block for multi-mount protection */
 	__le32  s_raid_stripe_width;    /* blocks on all data disks (N*stride)*/
 	__u8	s_log_groups_per_flex;  /* FLEX_BG group size */
-	__u8	s_reserved_char_pad;
+	__u8	s_checksum_type;	/* metadata checksum algorithm used */
 	__le16  s_reserved_pad;
 	__le64	s_kbytes_written;	/* nr of lifetime kilobytes written */
 	__le32	s_snapshot_inum;	/* Inode number of active snapshot */
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 44d0c8d..ac33e45 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -110,6 +110,16 @@ static struct file_system_type ext3_fs_type = {
 #define IS_EXT3_SB(sb) (0)
 #endif
 
+static int ext4_verify_csum_type(struct super_block *sb,
+				 struct ext4_super_block *es)
+{
+	if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,
+					EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+		return 1;
+
+	return es->s_checksum_type == EXT4_CRC32C_CHKSUM;
+}
+
 void *ext4_kvmalloc(size_t size, gfp_t flags)
 {
 	void *ret;
@@ -3153,6 +3163,14 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 		goto cantfind_ext4;
 	sbi->s_kbytes_written = le64_to_cpu(es->s_kbytes_written);
 
+	/* Check for a known checksum algorithm */
+	if (!ext4_verify_csum_type(sb, es)) {
+		ext4_msg(sb, KERN_ERR, "VFS: Found ext4 filesystem with "
+			 "unknown checksum algorithm.");
+		silent = 1;
+		goto cantfind_ext4;
+	}
+
 	/* Set defaults before we parse the mount options */
 	def_mount_opts = le32_to_cpu(es->s_default_mount_opts);
 	set_opt(sb, INIT_INODE_TABLE);

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

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-08  7:53 [PATCH v2 00/28] ext4: Add metadata checksumming Darrick J. Wong
2011-10-08  7:53 ` [PATCH 01/28] ext4: ext4_dx_add_entry should dirty directory metadata with the directory inode Darrick J. Wong
2011-10-08  7:53 ` [PATCH 02/28] ext4: ext4_rename should dirty dir_bh with the correct directory Darrick J. Wong
2011-10-08  7:54 ` [PATCH 03/28] ext4: ext4_mkdir should dirty dir_block with the parent inode Darrick J. Wong
2011-10-08  7:54 ` [PATCH 04/28] ext4: Prevent stack overrun in ext4_file_open when recording last known mountpoint Darrick J. Wong
2011-10-08  7:54 ` [PATCH 05/28] ext4: Fix endian problem in MMP initialization Darrick J. Wong
2011-10-08  7:54 ` [PATCH 06/28] ext4: Create a new BH_Verified flag to avoid unnecessary metadata validation Darrick J. Wong
2011-10-08  7:54 ` [PATCH 07/28] ext4: Create a rocompat flag for extended metadata checksumming Darrick J. Wong
2011-10-08  7:54 ` Darrick J. Wong [this message]
2011-10-08  7:54 ` [PATCH 09/28] ext4: Only call out to crc32c if necessary Darrick J. Wong
2011-10-08  7:54 ` [PATCH 10/28] ext4: Calculate and verify superblock checksum Darrick J. Wong
2011-10-08  7:54 ` [PATCH 11/28] ext4: Calculate and verify inode checksums Darrick J. Wong
2011-10-12 19:45   ` Andreas Dilger
2011-10-12 21:03     ` Darrick J. Wong
2011-10-13  0:02       ` Andreas Dilger
2011-10-08  7:55 ` [PATCH 12/28] ext4: Use i_generation in inode-related metadata checksums Darrick J. Wong
2011-10-12 19:52   ` Andreas Dilger
2011-10-12 21:28     ` Darrick J. Wong
2011-10-13  0:06       ` Andreas Dilger
2011-10-08  7:55 ` [PATCH 13/28] ext4: Create bitmap checksum helper functions Darrick J. Wong
2011-10-08  7:55 ` [PATCH 14/28] ext4: Calculate and verify checksums for inode bitmaps Darrick J. Wong
2011-10-08  7:55 ` [PATCH 15/28] ext4: Calculate and verify block bitmap checksum Darrick J. Wong
     [not found]   ` <AE869D1A-2A06-4849-8752-74924B0C05BD@dilger.ca>
2011-10-13  7:16     ` Darrick J. Wong
2011-11-07 20:00       ` Darrick J. Wong
2011-11-07 21:44         ` Andreas Dilger
2011-11-10  0:57           ` Darrick J. Wong
2011-11-10  2:34             ` Andreas Dilger
2011-10-08  7:55 ` [PATCH 16/28] ext4: Verify and calculate checksums for extent tree blocks Darrick J. Wong
2011-10-08  7:55 ` [PATCH 17/28] ext4: Calculate and verify checksums for htree nodes Darrick J. Wong
     [not found]   ` <F6453844-06CC-4245-BB39-EBA4327D4C92@dilger.ca>
2011-10-13  7:21     ` Darrick J. Wong
2011-10-08  7:55 ` [PATCH 18/28] ext4: Calculate and verify checksums of directory leaf blocks Darrick J. Wong
2011-10-08  7:55 ` [PATCH 19/28] ext4: Calculate and verify checksums of extended attribute blocks Darrick J. Wong
2011-10-08  7:55 ` [PATCH 20/28] ext4: Add new feature to make block group checksums use metadata_csum algorithm Darrick J. Wong
2011-10-08  7:56 ` [PATCH 21/28] ext4: Add checksums to the MMP block Darrick J. Wong
2011-10-08  7:56 ` [PATCH 22/28] jbd2: Update structure definitions and flags to support extended checksumming Darrick J. Wong
2011-10-08  7:56 ` [PATCH 23/28] jbd2: Grab a reference to the crc32c driver only when necessary Darrick J. Wong
2011-10-08  7:56 ` [PATCH 24/28] jbd2: Update structure definitions and flags to support extended checksumming Darrick J. Wong
2011-10-08  7:56 ` [PATCH 25/28] jbd2: Checksum revocation blocks Darrick J. Wong
2011-10-08  7:56 ` [PATCH 26/28] jbd2: Checksum descriptor blocks Darrick J. Wong
2011-10-08  7:56 ` [PATCH 27/28] jbd2: Checksum commit blocks Darrick J. Wong
2011-10-08  7:56 ` [PATCH 28/28] jbd2: Checksum data blocks that are stored in the 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=20111008075436.20506.63897.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=greg.freemyer@gmail.com \
    --cc=jlbec@evilplan.org \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=martin.petersen@oracle.com \
    --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).