diff options
| author |   Dave Chinner <david@fromorbit.com> | 2015-02-10 09:24:25 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-02-10 09:24:25 +1100 |
| commit | bad962662dbc60e76ec1baae34af56b1ba2dfa5f (patch) | |
| tree | bf6d56e8658ab5eceb6edec34d4f205f4217d23b /fs/xfs/xfs_super.c | |
| parent | Merge branch 'xfs-ioctl-setattr-cleanup' into for-next (diff) | |
| parent | xfs: only trace buffer items if they exist (diff) | |
| download | linux-dev-bad962662dbc60e76ec1baae34af56b1ba2dfa5f.tar.xz linux-dev-bad962662dbc60e76ec1baae34af56b1ba2dfa5f.zip | |
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.c | 5 |
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); |