From e5b437f07b12dc7525ef7fdfb312dd8ee797dfcb Mon Sep 17 00:00:00 2001
From: "Jose R. Santos" <jrs@us.ibm.com>
Date: Wed, 18 Jul 2007 08:37:25 -0400
Subject: [PATCH] --- yaml --- r: 61247 b: refs/heads/master c:
 eb40a09c679d7f9709f7087add57f2e1c7122bb3 h: refs/heads/master i:   61245:
 7a3c9277db08d911a0d2129672554c351eaa388d   61243:
 bc119bb68535a1919a1c13368b36b94a8056e297   61239:
 ba08b072b9e508f32dfedb0c193bee91156aaf5a   61231:
 c757f2b7a3fe9dc5ade3b7c2cac4300cc714721f   61215:
 c369ba9a489f2eb9cd0cdcbade984cf4d3eb791c   61183:
 29b487e8a30f5f000eda6a9f9703744fb64614d2 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ext4/super.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e3080d589edf..0fb6e8187fa8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c29c0ae7f282828da3695167ed870131798348d9
+refs/heads/master: eb40a09c679d7f9709f7087add57f2e1c7122bb3
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 9c8baf460588..af0835187e76 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -1813,6 +1813,13 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
 		goto failed_mount3;
 	}
 
+	if (ext4_blocks_count(es) > 0xffffffffULL &&
+	    !jbd2_journal_set_features(EXT4_SB(sb)->s_journal, 0, 0,
+				       JBD2_FEATURE_INCOMPAT_64BIT)) {
+		printk(KERN_ERR "ext4: Failed to set 64-bit journal feature\n");
+		goto failed_mount4;
+	}
+
 	/* We have now updated the journal if required, so we can
 	 * validate the data journaling mode. */
 	switch (test_opt(sb, DATA_FLAGS)) {