summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_trans_dquot.c
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2020-07-14 10:37:31 -0700
committerDarrick J. Wong <darrick.wong@oracle.com>2020-07-28 20:24:14 -0700
commitc8c45fb2f614e1d30526c5aa304352923ad76416 (patch)
tree02e1b34ba52f47e99763ea2625c60628cb610623 /fs/xfs/xfs_trans_dquot.c
parentbe37d40c1ba0b5484ea2f8c109a9eda13e4c690a (diff)
xfs: stop using q_core warning counters in the quota code
Add warning counter fields to the incore dquot, and use that instead of the ones in qcore. This eliminates a bunch of endian conversions and will eventually allow us to remove qcore entirely. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Chandan Babu R <chandanrlinux@gmail.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Allison Collins <allison.henderson@oracle.com>
Diffstat (limited to 'fs/xfs/xfs_trans_dquot.c')
-rw-r--r--fs/xfs/xfs_trans_dquot.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c
index 1c2a45989aaf..58cbc8f216f1 100644
--- a/fs/xfs/xfs_trans_dquot.c
+++ b/fs/xfs/xfs_trans_dquot.c
@@ -592,7 +592,7 @@ xfs_trans_dqresv(
if (!softlimit)
softlimit = defq->bsoftlimit;
timer = be32_to_cpu(dqp->q_core.d_btimer);
- warns = be16_to_cpu(dqp->q_core.d_bwarns);
+ warns = dqp->q_blk.warnings;
warnlimit = defq->bwarnlimit;
resbcountp = &dqp->q_blk.reserved;
} else {
@@ -604,7 +604,7 @@ xfs_trans_dqresv(
if (!softlimit)
softlimit = defq->rtbsoftlimit;
timer = be32_to_cpu(dqp->q_core.d_rtbtimer);
- warns = be16_to_cpu(dqp->q_core.d_rtbwarns);
+ warns = dqp->q_rtb.warnings;
warnlimit = defq->rtbwarnlimit;
resbcountp = &dqp->q_rtb.reserved;
}
@@ -639,7 +639,7 @@ xfs_trans_dqresv(
if (ninos > 0) {
total_count = dqp->q_ino.reserved + ninos;
timer = be32_to_cpu(dqp->q_core.d_itimer);
- warns = be16_to_cpu(dqp->q_core.d_iwarns);
+ warns = dqp->q_ino.warnings;
warnlimit = defq->iwarnlimit;
hardlimit = dqp->q_ino.hardlimit;
if (!hardlimit)