diff options
| author | David S. Miller <davem@davemloft.net> | 2014-08-23 11:12:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-08-23 11:12:08 -0700 |
| commit | f9474ddfaa009ead12bba44fa8fd49dc4536a124 (patch) | |
| tree | a1738a74ac909d84cc80af674d7c0b78af10a413 /fs/ext3/super.c | |
| parent | 989e04c5bc3ff77d65e1f0d87bf7904dfa30d41c (diff) | |
| parent | a45e92a599e77ee6a850eabdd0141633fde03915 (diff) | |
| download | kernel_replicant_linux-f9474ddfaa009ead12bba44fa8fd49dc4536a124.tar.gz kernel_replicant_linux-f9474ddfaa009ead12bba44fa8fd49dc4536a124.tar.bz2 kernel_replicant_linux-f9474ddfaa009ead12bba44fa8fd49dc4536a124.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pulling to get some TIPC fixes that a net-next series depends
upon.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/ext3/super.c')
| -rw-r--r-- | fs/ext3/super.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c index 08cdfe5461e3..622e88249024 100644 --- a/fs/ext3/super.c +++ b/fs/ext3/super.c @@ -2828,8 +2828,9 @@ static int ext3_statfs (struct dentry * dentry, struct kstatfs * buf) */ overhead += ngroups * (2 + sbi->s_itb_per_group); - /* Add the journal blocks as well */ - overhead += sbi->s_journal->j_maxlen; + /* Add the internal journal blocks as well */ + if (sbi->s_journal && !sbi->journal_bdev) + overhead += sbi->s_journal->j_maxlen; sbi->s_overhead_last = overhead; smp_wmb(); |