diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 12:03:16 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-04 12:04:51 -0500 |
| commit | 4ea41e2de5bba756858bb40f964e3490b6d1a25c (patch) | |
| tree | 51a688be321dd42f80d8a0c966eb6a60408d50b3 /fs/xfs/quota/xfs_qm_bhv.c | |
| parent | 8d75da8afd068fa58b35e69c7c8c46770d9e7a98 (diff) | |
| parent | 398007f863a4af2b4a5a07219c5a617f1a098115 (diff) | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming
Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c.
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 | } |