diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/xfs/quota/xfs_qm_bhv.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/xfs/quota/xfs_qm_bhv.c')
| -rw-r--r-- | fs/xfs/quota/xfs_qm_bhv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/quota/xfs_qm_bhv.c b/fs/xfs/quota/xfs_qm_bhv.c index a5346630dfae..97b410c12794 100644 --- a/fs/xfs/quota/xfs_qm_bhv.c +++ b/fs/xfs/quota/xfs_qm_bhv.c | |||
| @@ -59,7 +59,7 @@ xfs_fill_statvfs_from_dquot( | |||
| 59 | be64_to_cpu(dp->d_blk_hardlimit); | 59 | be64_to_cpu(dp->d_blk_hardlimit); |
| 60 | if (limit && statp->f_blocks > limit) { | 60 | if (limit && statp->f_blocks > limit) { |
| 61 | statp->f_blocks = limit; | 61 | statp->f_blocks = limit; |
| 62 | statp->f_bfree = | 62 | statp->f_bfree = statp->f_bavail = |
| 63 | (statp->f_blocks > be64_to_cpu(dp->d_bcount)) ? | 63 | (statp->f_blocks > be64_to_cpu(dp->d_bcount)) ? |
| 64 | (statp->f_blocks - be64_to_cpu(dp->d_bcount)) : 0; | 64 | (statp->f_blocks - be64_to_cpu(dp->d_bcount)) : 0; |
| 65 | } | 65 | } |