From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 14/18] xfs: refactor quota exceeded test
Date: Tue, 30 Jun 2020 08:43:20 -0700 [thread overview]
Message-ID: <159353180004.2864738.3571543752803090361.stgit@magnolia> (raw)
In-Reply-To: <159353170983.2864738.16885438169173786208.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Refactor the open-coded test for whether or not we're over quota.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/xfs_dquot.c | 95 ++++++++++++++++------------------------------------
1 file changed, 30 insertions(+), 65 deletions(-)
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
index 35a113d1b42b..ef34c82c28a0 100644
--- a/fs/xfs/xfs_dquot.c
+++ b/fs/xfs/xfs_dquot.c
@@ -97,6 +97,33 @@ xfs_qm_adjust_dqlimits(
xfs_dquot_set_prealloc_limits(dq);
}
+/*
+ * Determine if this quota counter is over either limit and set the quota
+ * timers as appropriate.
+ */
+static inline void
+xfs_qm_adjust_res_timer(
+ struct xfs_dquot_res *res,
+ struct xfs_def_qres *dres)
+{
+ bool over;
+
+#ifdef DEBUG
+ if (res->hardlimit)
+ ASSERT(res->softlimit <= res->hardlimit);
+#endif
+
+ over = (res->softlimit && res->count > res->softlimit) ||
+ (res->hardlimit && res->count > res->hardlimit);
+
+ if (over && res->timer == 0)
+ res->timer = ktime_get_real_seconds() + dres->timelimit;
+ else if (!over && res->timer != 0)
+ res->timer = 0;
+ else if (!over && res->timer == 0)
+ res->warnings = 0;
+}
+
/*
* Check the limits and timers of a dquot and start or reset timers
* if necessary.
@@ -121,71 +148,9 @@ xfs_qm_adjust_dqtimers(
ASSERT(dq->q_id);
defq = xfs_get_defquota(qi, xfs_dquot_type(dq));
-#ifdef DEBUG
- if (dq->q_blk.hardlimit)
- ASSERT(dq->q_blk.softlimit <= dq->q_blk.hardlimit);
- if (dq->q_ino.hardlimit)
- ASSERT(dq->q_ino.softlimit <= dq->q_ino.hardlimit);
- if (dq->q_rtb.hardlimit)
- ASSERT(dq->q_rtb.softlimit <= dq->q_rtb.hardlimit);
-#endif
-
- if (!dq->q_blk.timer) {
- if ((dq->q_blk.softlimit &&
- (dq->q_blk.count > dq->q_blk.softlimit)) ||
- (dq->q_blk.hardlimit &&
- (dq->q_blk.count > dq->q_blk.hardlimit))) {
- dq->q_blk.timer = ktime_get_real_seconds() +
- defq->dfq_blk.timelimit;
- } else {
- dq->q_blk.warnings = 0;
- }
- } else {
- if ((!dq->q_blk.softlimit ||
- (dq->q_blk.count <= dq->q_blk.softlimit)) &&
- (!dq->q_blk.hardlimit ||
- (dq->q_blk.count <= dq->q_blk.hardlimit))) {
- dq->q_blk.timer = 0;
- }
- }
-
- if (!dq->q_ino.timer) {
- if ((dq->q_ino.softlimit &&
- (dq->q_ino.count > dq->q_ino.softlimit)) ||
- (dq->q_ino.hardlimit &&
- (dq->q_ino.count > dq->q_ino.hardlimit))) {
- dq->q_ino.timer = ktime_get_real_seconds() +
- defq->dfq_ino.timelimit;
- } else {
- dq->q_ino.warnings = 0;
- }
- } else {
- if ((!dq->q_ino.softlimit ||
- (dq->q_ino.count <= dq->q_ino.softlimit)) &&
- (!dq->q_ino.hardlimit ||
- (dq->q_ino.count <= dq->q_ino.hardlimit))) {
- dq->q_ino.timer = 0;
- }
- }
-
- if (!dq->q_rtb.timer) {
- if ((dq->q_rtb.softlimit &&
- (dq->q_rtb.count > dq->q_rtb.softlimit)) ||
- (dq->q_rtb.hardlimit &&
- (dq->q_rtb.count > dq->q_rtb.hardlimit))) {
- dq->q_rtb.timer = ktime_get_real_seconds() +
- defq->dfq_rtb.timelimit;
- } else {
- dq->q_rtb.warnings = 0;
- }
- } else {
- if ((!dq->q_rtb.softlimit ||
- (dq->q_rtb.count <= dq->q_rtb.softlimit)) &&
- (!dq->q_rtb.hardlimit ||
- (dq->q_rtb.count <= dq->q_rtb.hardlimit))) {
- dq->q_rtb.timer = 0;
- }
- }
+ xfs_qm_adjust_res_timer(&dq->q_blk, &defq->dfq_blk);
+ xfs_qm_adjust_res_timer(&dq->q_ino, &defq->dfq_ino);
+ xfs_qm_adjust_res_timer(&dq->q_rtb, &defq->dfq_rtb);
}
/*
next prev parent reply other threads:[~2020-06-30 15:43 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 15:41 [PATCH 00/18] xfs: remove xfs_disk_quot from incore dquot Darrick J. Wong
2020-06-30 15:41 ` [PATCH 01/18] xfs: clear XFS_DQ_FREEING if we can't lock the dquot buffer to flush Darrick J. Wong
2020-06-30 21:35 ` Allison Collins
2020-07-01 8:32 ` Chandan Babu R
2020-07-01 8:33 ` Christoph Hellwig
2020-07-01 22:42 ` Dave Chinner
2020-06-30 15:42 ` [PATCH 02/18] xfs: fix inode quota reservation checks Darrick J. Wong
2020-06-30 21:35 ` Allison Collins
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:34 ` Christoph Hellwig
2020-06-30 15:42 ` [PATCH 03/18] xfs: validate ondisk/incore dquot flags Darrick J. Wong
2020-06-30 21:35 ` Allison Collins
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:42 ` Christoph Hellwig
2020-07-01 18:25 ` Darrick J. Wong
2020-07-02 6:30 ` Christoph Hellwig
2020-07-02 15:13 ` Darrick J. Wong
2020-07-01 22:41 ` Dave Chinner
2020-07-01 23:16 ` Darrick J. Wong
2020-06-30 15:42 ` [PATCH 04/18] xfs: stop using q_core.d_flags in the quota code Darrick J. Wong
2020-07-01 8:34 ` Chandan Babu R
2020-07-01 8:47 ` Christoph Hellwig
2020-07-01 19:02 ` Darrick J. Wong
2020-07-01 20:15 ` Allison Collins
2020-07-01 22:50 ` Dave Chinner
2020-07-01 23:19 ` Darrick J. Wong
2020-07-01 23:44 ` Dave Chinner
2020-07-01 23:50 ` Darrick J. Wong
2020-07-03 0:58 ` Dave Chinner
2020-07-03 18:01 ` Darrick J. Wong
2020-06-30 15:42 ` [PATCH 05/18] xfs: stop using q_core.d_id " Darrick J. Wong
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:48 ` Christoph Hellwig
2020-07-01 20:16 ` Allison Collins
2020-06-30 15:42 ` [PATCH 06/18] xfs: use a per-resource struct for incore dquot data Darrick J. Wong
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:49 ` Christoph Hellwig
2020-07-01 20:16 ` Allison Collins
2020-06-30 15:42 ` [PATCH 07/18] xfs: stop using q_core limits in the quota code Darrick J. Wong
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:50 ` Christoph Hellwig
2020-07-01 20:16 ` Allison Collins
2020-07-01 23:01 ` Dave Chinner
2020-07-01 23:13 ` Darrick J. Wong
2020-07-01 23:33 ` Darrick J. Wong
2020-07-01 23:45 ` Dave Chinner
2020-06-30 15:42 ` [PATCH 08/18] xfs: stop using q_core counters " Darrick J. Wong
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:51 ` Christoph Hellwig
2020-07-01 23:20 ` Allison Collins
2020-06-30 15:42 ` [PATCH 09/18] xfs: stop using q_core warning " Darrick J. Wong
2020-07-01 8:33 ` Chandan Babu R
2020-07-01 8:51 ` Christoph Hellwig
2020-07-01 23:20 ` Allison Collins
2020-06-30 15:42 ` [PATCH 10/18] xfs: stop using q_core timers " Darrick J. Wong
2020-07-01 8:34 ` Chandan Babu R
2020-07-01 8:51 ` Christoph Hellwig
2020-07-01 23:20 ` Allison Collins
2020-06-30 15:43 ` [PATCH 11/18] xfs: remove qcore from incore dquots Darrick J. Wong
2020-07-01 8:34 ` Chandan Babu R
2020-07-01 8:52 ` Christoph Hellwig
2020-07-01 23:07 ` Dave Chinner
2020-07-01 23:14 ` Darrick J. Wong
2020-07-02 2:06 ` Allison Collins
2020-06-30 15:43 ` [PATCH 12/18] xfs: refactor default quota limits by resource Darrick J. Wong
2020-07-01 8:52 ` Chandan Babu R
2020-07-01 8:53 ` Christoph Hellwig
2020-07-01 23:30 ` Dave Chinner
2020-07-02 0:07 ` Darrick J. Wong
2020-07-02 2:06 ` Allison Collins
2020-06-30 15:43 ` [PATCH 13/18] xfs: remove unnecessary arguments from quota adjust functions Darrick J. Wong
2020-07-01 8:53 ` Christoph Hellwig
2020-07-01 8:58 ` Chandan Babu R
2020-07-02 2:06 ` Allison Collins
2020-06-30 15:43 ` Darrick J. Wong [this message]
2020-07-01 8:56 ` [PATCH 14/18] xfs: refactor quota exceeded test Christoph Hellwig
2020-07-01 17:51 ` Darrick J. Wong
2020-07-01 18:48 ` Eric Sandeen
2020-07-01 23:34 ` Dave Chinner
2020-07-01 10:19 ` Chandan Babu R
2020-07-02 18:57 ` Allison Collins
2020-06-30 15:43 ` [PATCH 15/18] xfs: refactor xfs_qm_scall_setqlim Darrick J. Wong
2020-07-01 8:56 ` Christoph Hellwig
2020-07-03 4:11 ` Allison Collins
2020-07-03 12:39 ` Chandan Babu R
2020-06-30 15:43 ` [PATCH 16/18] xfs: refactor xfs_trans_dqresv Darrick J. Wong
2020-07-03 4:11 ` Allison Collins
2020-07-03 13:00 ` Chandan Babu R
2020-06-30 15:43 ` [PATCH 17/18] xfs: refactor xfs_trans_apply_dquot_deltas Darrick J. Wong
2020-07-04 20:41 ` Allison Collins
2020-07-06 13:40 ` Chandan Babu R
2020-06-30 15:43 ` [PATCH 18/18] xfs: add more dquot tracepoints Darrick J. Wong
2020-07-04 20:41 ` Allison Collins
2020-07-06 13:42 ` Chandan Babu R
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=159353180004.2864738.3571543752803090361.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).