summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_super.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-02-10 01:24:25 +0300
committerDave Chinner <david@fromorbit.com>2015-02-10 01:24:25 +0300
commitbad962662dbc60e76ec1baae34af56b1ba2dfa5f (patch)
treebf6d56e8658ab5eceb6edec34d4f205f4217d23b /fs/xfs/xfs_super.c
parent179073620d8090e9c52bf203e2033fc9cfe088b3 (diff)
parente9892d3cc853afdda2cc69e2576d9ddb5fafad71 (diff)
downloadlinux-bad962662dbc60e76ec1baae34af56b1ba2dfa5f.tar.xz
Merge branch 'xfs-misc-fixes-for-3.20-4' into for-next
Diffstat (limited to 'fs/xfs/xfs_super.c')
-rw-r--r--fs/xfs/xfs_super.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
index 5ce76d01885d..f2449fd86926 100644
--- a/fs/xfs/xfs_super.c
+++ b/fs/xfs/xfs_super.c
@@ -1111,6 +1111,11 @@ xfs_fs_statfs(
statp->f_files,
mp->m_maxicount);
+ /* If sb_icount overshot maxicount, report actual allocation */
+ statp->f_files = max_t(typeof(statp->f_files),
+ statp->f_files,
+ sbp->sb_icount);
+
/* make sure statp->f_ffree does not underflow */
ffree = statp->f_files - (sbp->sb_icount - sbp->sb_ifree);
statp->f_ffree = max_t(__int64_t, ffree, 0);