diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index e09f7d1646b..4969167ac26 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3231,6 +3231,10 @@ int ext4_calculate_overhead(struct super_block *sb)
 			memset(buf, 0, PAGE_SIZE);
 		cond_resched();
 	}
+	/* Add the journal blocks as well */
+	if (sbi->s_journal)
+		overhead += EXT4_B2C(sbi, sbi->s_journal->j_maxlen);
+
 	sbi->s_overhead = overhead;
 	smp_wmb();
 	free_page((unsigned long) buf);