From: Eric Sandeen <sandeen@redhat.com>
Date: Tue, 25 Dec 2012 18:56:01 +0000 (-0500)
Subject: ext4: include journal blocks in df overhead calcs
X-Git-Tag: v3.8-rc2~9^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0875a2b448fcaba67010850cf9649293a5ef653d;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

ext4: include journal blocks in df overhead calcs

To more accurately calculate overhead for "bsd" style
df reporting, we should count the journal blocks as
overhead as well.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Tested-by: Eric Whitney <enwlinux@gmail.com>
---

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index e09f7d1..4969167 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);