1 files changed, 7 insertions, 0 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 9c8baf46058..af0835187e7 100644
--- a/fs/ext4/super.c
+++ b/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)) {