---

yaml --- r: 309945 b: refs/heads/master c: f32aaf2 h: refs/heads/master i: 309943: 94f42fc v: v3
git-mirror · May 21, 2012 · ffbe1f4 · ffbe1f4
1 parent b1322ba
commit ffbe1f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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");