summaryrefslogtreecommitdiff
path: root/fs/ext3
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-13 10:25:47 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-13 10:25:47 +0400
commita30124539b2641c5b3551193af7d21a6fc61ba98 (patch)
treea1c7f5e641b8f44b16f1b1d201870bb7f155e8d6 /fs/ext3
parentdd1d1399f2884102172f761816c32aa311bceafb (diff)
parent7ba3ec5749ddb61f79f7be17b5fd7720eebc52de (diff)
downloadlinux-a30124539b2641c5b3551193af7d21a6fc61ba98.tar.xz
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext[23], udf and quota fixes from Jan Kara: "Assorted fixes in quota, ext2, ext3 & udf. Probably the most important is a fix of fs corruption issue in ext2 XIP support (OTOH xip is rarely used)" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: ext2: Fix fs corruption in ext2_get_xip_mem() quota: info leak in quota_getquota() jbd: Revert "jbd: remove dependency on __GFP_NOFAIL" udf: fix for pathetic mount times in case of invalid file system ext3: Count journal as bsddf overhead in ext3_statfs
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/super.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index c50c76190373..37fd31ed16e7 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2825,6 +2825,10 @@ static int ext3_statfs (struct dentry * dentry, struct kstatfs * buf)
* bitmap, and an inode table.
*/
overhead += ngroups * (2 + sbi->s_itb_per_group);
+
+ /* Add the journal blocks as well */
+ overhead += sbi->s_journal->j_maxlen;
+
sbi->s_overhead_last = overhead;
smp_wmb();
sbi->s_blocks_last = le32_to_cpu(es->s_blocks_count);