diff options
Diffstat (limited to 'fs/xfs/xfs_qm_bhv.c')
-rw-r--r-- | fs/xfs/xfs_qm_bhv.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/xfs/xfs_qm_bhv.c b/fs/xfs/xfs_qm_bhv.c index a0a829addca9..e4e37877f867 100644 --- a/fs/xfs/xfs_qm_bhv.c +++ b/fs/xfs/xfs_qm_bhv.c | |||
@@ -40,28 +40,28 @@ | |||
40 | STATIC void | 40 | STATIC void |
41 | xfs_fill_statvfs_from_dquot( | 41 | xfs_fill_statvfs_from_dquot( |
42 | struct kstatfs *statp, | 42 | struct kstatfs *statp, |
43 | xfs_disk_dquot_t *dp) | 43 | struct xfs_dquot *dqp) |
44 | { | 44 | { |
45 | __uint64_t limit; | 45 | __uint64_t limit; |
46 | 46 | ||
47 | limit = dp->d_blk_softlimit ? | 47 | limit = dqp->q_core.d_blk_softlimit ? |
48 | be64_to_cpu(dp->d_blk_softlimit) : | 48 | be64_to_cpu(dqp->q_core.d_blk_softlimit) : |
49 | be64_to_cpu(dp->d_blk_hardlimit); | 49 | be64_to_cpu(dqp->q_core.d_blk_hardlimit); |
50 | if (limit && statp->f_blocks > limit) { | 50 | if (limit && statp->f_blocks > limit) { |
51 | statp->f_blocks = limit; | 51 | statp->f_blocks = limit; |
52 | statp->f_bfree = statp->f_bavail = | 52 | statp->f_bfree = statp->f_bavail = |
53 | (statp->f_blocks > be64_to_cpu(dp->d_bcount)) ? | 53 | (statp->f_blocks > dqp->q_res_bcount) ? |
54 | (statp->f_blocks - be64_to_cpu(dp->d_bcount)) : 0; | 54 | (statp->f_blocks - dqp->q_res_bcount) : 0; |
55 | } | 55 | } |
56 | 56 | ||
57 | limit = dp->d_ino_softlimit ? | 57 | limit = dqp->q_core.d_ino_softlimit ? |
58 | be64_to_cpu(dp->d_ino_softlimit) : | 58 | be64_to_cpu(dqp->q_core.d_ino_softlimit) : |
59 | be64_to_cpu(dp->d_ino_hardlimit); | 59 | be64_to_cpu(dqp->q_core.d_ino_hardlimit); |
60 | if (limit && statp->f_files > limit) { | 60 | if (limit && statp->f_files > limit) { |
61 | statp->f_files = limit; | 61 | statp->f_files = limit; |
62 | statp->f_ffree = | 62 | statp->f_ffree = |
63 | (statp->f_files > be64_to_cpu(dp->d_icount)) ? | 63 | (statp->f_files > dqp->q_res_icount) ? |
64 | (statp->f_ffree - be64_to_cpu(dp->d_icount)) : 0; | 64 | (statp->f_ffree - dqp->q_res_icount) : 0; |
65 | } | 65 | } |
66 | } | 66 | } |
67 | 67 | ||
@@ -82,7 +82,7 @@ xfs_qm_statvfs( | |||
82 | xfs_dquot_t *dqp; | 82 | xfs_dquot_t *dqp; |
83 | 83 | ||
84 | if (!xfs_qm_dqget(mp, NULL, xfs_get_projid(ip), XFS_DQ_PROJ, 0, &dqp)) { | 84 | if (!xfs_qm_dqget(mp, NULL, xfs_get_projid(ip), XFS_DQ_PROJ, 0, &dqp)) { |
85 | xfs_fill_statvfs_from_dquot(statp, &dqp->q_core); | 85 | xfs_fill_statvfs_from_dquot(statp, dqp); |
86 | xfs_qm_dqput(dqp); | 86 | xfs_qm_dqput(dqp); |
87 | } | 87 | } |
88 | } | 88 | } |