diff --git a/[refs] b/[refs]
index 987a019f2e63..f3be8f671203 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a28a9178e8fcd9b94f7333184ce78e816c8cb2af
+refs/heads/master: 0875a2b448fcaba67010850cf9649293a5ef653d
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index e09f7d1646ba..4969167ac267 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/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);