Index: linux-2.6.22-ext4/fs/ext4/super.c
===================================================================
--- linux-2.6.22-ext4.orig/fs/ext4/super.c	2007-07-26 10:48:52.000000000 +0200
+++ linux-2.6.22-ext4/fs/ext4/super.c	2007-07-26 17:29:44.000000000 +0200
@@ -736,7 +736,7 @@
 	Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
 	Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
 	Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
-	Opt_grpquota, Opt_extents, Opt_noextents,
+	Opt_grpquota, Opt_extents, Opt_noextents, Opt_i_version,
 	Opt_delayed_alloc, Opt_nodelayed_alloc,
 };
 
@@ -793,6 +793,7 @@
 	{Opt_noextents, "noextents"},
 	{Opt_delayed_alloc, "delalloc"},
 	{Opt_nodelayed_alloc, "nodelalloc"},
+	{Opt_i_version, "i_version"},
 	{Opt_err, NULL},
 	{Opt_resize, "resize"},
 };
@@ -1144,6 +1145,9 @@
 		case Opt_noextents:
 			clear_opt (sbi->s_mount_opt, EXTENTS);
 			break;
+		case Opt_i_version:
+			clear_opt (sbi->s_mount_opt, I_VERSION);
+			break;
 		default:
 			printk (KERN_ERR
 				"EXT4-fs: Unrecognized mount option \"%s\" "
Index: linux-2.6.22-ext4/include/linux/ext4_fs.h
===================================================================
--- linux-2.6.22-ext4.orig/include/linux/ext4_fs.h	2007-07-26 10:48:52.000000000 +0200
+++ linux-2.6.22-ext4/include/linux/ext4_fs.h	2007-07-26 10:51:11.000000000 +0200
@@ -489,6 +489,7 @@
 #define EXT4_MOUNT_JOURNAL_CHECKSUM	0x800000 /* Journal checksums */
 #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT	0x1000000 /* Journal Async Commit */
 #define EXT4_MOUNT_DELAYED_ALLOC	0x2000000/* Delayed allocation support*/
+#define EXT4_MOUNT_I_VERSION		0x4000000/* i_version support */
 
 /* Compatibility, for having both ext2_fs.h and ext4_fs.h included at once */
 #ifndef _LINUX_EXT2_FS_H
Index: linux-2.6.22-ext4/fs/ext4/inode.c
===================================================================
--- linux-2.6.22-ext4.orig/fs/ext4/inode.c	2007-07-26 10:48:52.000000000 +0200
+++ linux-2.6.22-ext4/fs/ext4/inode.c	2007-07-30 16:08:19.000000000 +0200
@@ -3107,7 +3107,9 @@
 {
 	int err = 0;
 
-	inode->i_version++;
+	if (test_opt(inode->i_sb, I_VERSION))
+		inode->i_version++;
+
 	/* the do_update_inode consumes one bh->b_count */
 	get_bh(iloc->bh);