From 1ebe05f911246d822a0b263de96975f73e3058ed Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 2 Mar 2012 12:23:11 -0500
Subject: [PATCH] --- yaml --- r: 296556 b: refs/heads/master c:
 c64db50e76c4bf68c0a84379d7bd70daada531b4 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/ext4.h  | 1 -
 trunk/fs/ext4/inode.c | 2 +-
 trunk/fs/ext4/super.c | 3 +--
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d7215ae5bd29..7b180f5f0270 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee4a3fcd1da660147624f13a9dc31d8bf43f5b06
+refs/heads/master: c64db50e76c4bf68c0a84379d7bd70daada531b4
diff --git a/trunk/fs/ext4/ext4.h b/trunk/fs/ext4/ext4.h
index 4076746d721d..df93dc196514 100644
--- a/trunk/fs/ext4/ext4.h
+++ b/trunk/fs/ext4/ext4.h
@@ -942,7 +942,6 @@ struct ext4_inode_info {
 #define EXT4_MOUNT_DIOREAD_NOLOCK	0x400000 /* Enable support for dio read nolocking */
 #define EXT4_MOUNT_JOURNAL_CHECKSUM	0x800000 /* Journal checksums */
 #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT	0x1000000 /* Journal Async Commit */
-#define EXT4_MOUNT_I_VERSION            0x2000000 /* i_version support */
 #define EXT4_MOUNT_MBLK_IO_SUBMIT	0x4000000 /* multi-block io submits */
 #define EXT4_MOUNT_DELALLOC		0x8000000 /* Delalloc support */
 #define EXT4_MOUNT_DATA_ERR_ABORT	0x10000000 /* Abort on file data write */
diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c
index aafc626d64ac..38dc5f3e9dd3 100644
--- a/trunk/fs/ext4/inode.c
+++ b/trunk/fs/ext4/inode.c
@@ -4322,7 +4322,7 @@ int ext4_mark_iloc_dirty(handle_t *handle,
 {
 	int err = 0;
 
-	if (test_opt(inode->i_sb, I_VERSION))
+	if (IS_I_VERSION(inode))
 		inode_inc_iversion(inode);
 
 	/* the do_update_inode consumes one bh->b_count */
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 7dbad76f92e8..6b27bc6eba40 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -1125,7 +1125,7 @@ static int ext4_show_options(struct seq_file *seq, struct dentry *root)
 		seq_puts(seq, ",journal_async_commit");
 	else if (test_opt(sb, JOURNAL_CHECKSUM))
 		seq_puts(seq, ",journal_checksum");
-	if (test_opt(sb, I_VERSION))
+	if (sb->s_flags & MS_I_VERSION)
 		seq_puts(seq, ",i_version");
 	if (!test_opt(sb, DELALLOC) &&
 	    !(def_mount_opts & EXT4_DEFM_NODELALLOC))
@@ -1793,7 +1793,6 @@ static int parse_options(char *options, struct super_block *sb,
 				 "Ignoring deprecated bh option");
 			break;
 		case Opt_i_version:
-			set_opt(sb, I_VERSION);
 			sb->s_flags |= MS_I_VERSION;
 			break;
 		case Opt_nodelalloc: