From ffbe1f459c8221d33889bd400aeba8891c2332a6 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 21 May 2012 11:42:02 -0400
Subject: [PATCH] --- yaml --- r: 309945 b: refs/heads/master c:
 f32aaf2d2b996b14e993da1c23f7ee22ea7333a3 h: refs/heads/master i:   309943:
 94f42fc2d12bcbc74e2c6f858b278c2e39ffe49a v: v3

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

diff --git a/[refs] b/[refs]
index 06adebea470d..f503ec4e155a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b09de7fa5217bbcb4caf3d19bd5e94816947ff7a
+refs/heads/master: f32aaf2d2b996b14e993da1c23f7ee22ea7333a3
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index c18c5968cd96..88c2054fb938 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -3603,7 +3603,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 		goto no_journal;
 	}
 
-	if (ext4_blocks_count(es) > 0xffffffffULL &&
+	if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT) &&
 	    !jbd2_journal_set_features(EXT4_SB(sb)->s_journal, 0, 0,
 				       JBD2_FEATURE_INCOMPAT_64BIT)) {
 		ext4_msg(sb, KERN_ERR, "Failed to set 64-bit journal feature");