Re: [PATCH 15/18] xfs: refactor xfs_qm_scall_setqlim

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





On 6/30/20 8:43 AM, Darrick J. Wong wrote:
From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>

Now that we can pass around quota resource and limit structures, clean
up the open-coded field setting in xfs_qm_scall_setqlim.

Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>

Ok, I followed it through, and I think it looks ok
Reviewed-by: Allison Collins <allison.henderson@xxxxxxxxxx>

---
  fs/xfs/xfs_qm_syscalls.c |  164 ++++++++++++++++++++++++++--------------------
  1 file changed, 93 insertions(+), 71 deletions(-)


diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 5423e02f9837..5044c333af5c 100644
--- a/fs/xfs/xfs_qm_syscalls.c
+++ b/fs/xfs/xfs_qm_syscalls.c
@@ -436,6 +436,58 @@ xfs_qm_scall_quotaon(
  #define XFS_QC_MASK \
  	(QC_LIMIT_MASK | QC_TIMER_MASK | QC_WARNS_MASK)
+/*
+ * Adjust limits of this quota, and the defaults if passed in.  Returns true
+ * if the new limits made sense and were applied, false otherwise.
+ */
+static inline bool
+xfs_setqlim_limits(
+	struct xfs_mount	*mp,
+	struct xfs_dquot_res	*res,
+	struct xfs_def_qres	*dres,
+	xfs_qcnt_t		hard,
+	xfs_qcnt_t		soft,
+	const char		*tag)
+{
+	/* The hard limit can't be less than the soft limit. */
+	if (hard != 0 && hard < soft) {
+		xfs_debug(mp, "%shard %lld < %ssoft %lld", tag, hard, tag,
+				soft);
+		return false;
+	}
+
+	res->hardlimit = hard;
+	res->softlimit = soft;
+	if (dres) {
+		dres->hardlimit = hard;
+		dres->softlimit = soft;
+	}
+
+	return true;
+}
+
+static inline void
+xfs_setqlim_warns(
+	struct xfs_dquot_res	*res,
+	struct xfs_def_qres	*dres,
+	int			warns)
+{
+	res->warnings = warns;
+	if (dres)
+		dres->warnlimit = warns;
+}
+
+static inline void
+xfs_setqlim_timer(
+	struct xfs_dquot_res	*res,
+	struct xfs_def_qres	*dres,
+	s64			timer)
+{
+	res->timer = timer;
+	if (dres)
+		dres->timelimit = timer;
+}
+
  /*
   * Adjust quota limits, and start/stop timers accordingly.
   */
@@ -450,6 +502,8 @@ xfs_qm_scall_setqlim(
  	struct xfs_dquot	*dqp;
  	struct xfs_trans	*tp;
  	struct xfs_def_quota	*defq;
+	struct xfs_dquot_res	*res;
+	struct xfs_def_qres	*dres;
  	int			error;
  	xfs_qcnt_t		hard, soft;
@@ -489,102 +543,70 @@ xfs_qm_scall_setqlim(
  	xfs_trans_dqjoin(tp, dqp);
/*
+	 * Update quota limits, warnings, and timers, and the defaults
+	 * if we're touching id == 0.
+	 *
  	 * Make sure that hardlimits are >= soft limits before changing.
+	 *
+	 * Update warnings counter(s) if requested.
+	 *
+	 * Timelimits for the super user set the relative time the other users
+	 * can be over quota for this file system. If it is zero a default is
+	 * used.  Ditto for the default soft and hard limit values (already
+	 * done, above), and for warnings.
+	 *
+	 * For other IDs, userspace can bump out the grace period if over
+	 * the soft limit.
  	 */
+
+	/* Blocks on the data device. */
  	hard = (newlim->d_fieldmask & QC_SPC_HARD) ?
  		(xfs_qcnt_t) XFS_B_TO_FSB(mp, newlim->d_spc_hardlimit) :
  			dqp->q_blk.hardlimit;
  	soft = (newlim->d_fieldmask & QC_SPC_SOFT) ?
  		(xfs_qcnt_t) XFS_B_TO_FSB(mp, newlim->d_spc_softlimit) :
  			dqp->q_blk.softlimit;
-	if (hard == 0 || hard >= soft) {
-		dqp->q_blk.hardlimit = hard;
-		dqp->q_blk.softlimit = soft;
+	res = &dqp->q_blk;
+	dres = id == 0 ? &defq->dfq_blk : NULL;
+
+	if (xfs_setqlim_limits(mp, res, dres, hard, soft, "blk"))
  		xfs_dquot_set_prealloc_limits(dqp);
-		if (id == 0) {
-			defq->dfq_blk.hardlimit = hard;
-			defq->dfq_blk.softlimit = soft;
-		}
-	} else {
-		xfs_debug(mp, "blkhard %Ld < blksoft %Ld", hard, soft);
-	}
+	if (newlim->d_fieldmask & QC_SPC_WARNS)
+		xfs_setqlim_warns(res, dres, newlim->d_spc_warns);
+	if (newlim->d_fieldmask & QC_SPC_TIMER)
+		xfs_setqlim_timer(res, dres, newlim->d_spc_timer);
+
+	/* Blocks on the realtime device. */
  	hard = (newlim->d_fieldmask & QC_RT_SPC_HARD) ?
  		(xfs_qcnt_t) XFS_B_TO_FSB(mp, newlim->d_rt_spc_hardlimit) :
  			dqp->q_rtb.hardlimit;
  	soft = (newlim->d_fieldmask & QC_RT_SPC_SOFT) ?
  		(xfs_qcnt_t) XFS_B_TO_FSB(mp, newlim->d_rt_spc_softlimit) :
  			dqp->q_rtb.softlimit;
-	if (hard == 0 || hard >= soft) {
-		dqp->q_rtb.hardlimit = hard;
-		dqp->q_rtb.softlimit = soft;
-		if (id == 0) {
-			defq->dfq_rtb.hardlimit = hard;
-			defq->dfq_rtb.softlimit = soft;
-		}
-	} else {
-		xfs_debug(mp, "rtbhard %Ld < rtbsoft %Ld", hard, soft);
-	}
+	res = &dqp->q_rtb;
+	dres = id == 0 ? &defq->dfq_rtb : NULL;
+ xfs_setqlim_limits(mp, res, dres, hard, soft, "rtb");
+	if (newlim->d_fieldmask & QC_RT_SPC_WARNS)
+		xfs_setqlim_warns(res, dres, newlim->d_rt_spc_warns);
+	if (newlim->d_fieldmask & QC_RT_SPC_TIMER)
+		xfs_setqlim_timer(res, dres, newlim->d_rt_spc_timer);
+
+	/* Inodes */
  	hard = (newlim->d_fieldmask & QC_INO_HARD) ?
  		(xfs_qcnt_t) newlim->d_ino_hardlimit :
  			dqp->q_ino.hardlimit;
  	soft = (newlim->d_fieldmask & QC_INO_SOFT) ?
  		(xfs_qcnt_t) newlim->d_ino_softlimit :
  			dqp->q_ino.softlimit;
-	if (hard == 0 || hard >= soft) {
-		dqp->q_ino.hardlimit = hard;
-		dqp->q_ino.softlimit = soft;
-		if (id == 0) {
-			defq->dfq_ino.hardlimit = hard;
-			defq->dfq_ino.softlimit = soft;
-		}
-	} else {
-		xfs_debug(mp, "ihard %Ld < isoft %Ld", hard, soft);
-	}
+	res = &dqp->q_ino;
+	dres = id == 0 ? &defq->dfq_ino : NULL;
- /*
-	 * Update warnings counter(s) if requested
-	 */
-	if (newlim->d_fieldmask & QC_SPC_WARNS)
-		dqp->q_blk.warnings = newlim->d_spc_warns;
+	xfs_setqlim_limits(mp, res, dres, hard, soft, "ino");
  	if (newlim->d_fieldmask & QC_INO_WARNS)
-		dqp->q_ino.warnings = newlim->d_ino_warns;
-	if (newlim->d_fieldmask & QC_RT_SPC_WARNS)
-		dqp->q_rtb.warnings = newlim->d_rt_spc_warns;
-
-	if (id == 0) {
-		if (newlim->d_fieldmask & QC_SPC_WARNS)
-			defq->dfq_blk.warnlimit = newlim->d_spc_warns;
-		if (newlim->d_fieldmask & QC_INO_WARNS)
-			defq->dfq_ino.warnlimit = newlim->d_ino_warns;
-		if (newlim->d_fieldmask & QC_RT_SPC_WARNS)
-			defq->dfq_rtb.warnlimit = newlim->d_rt_spc_warns;
-	}
-
-	/*
-	 * Timelimits for the super user set the relative time the other users
-	 * can be over quota for this file system. If it is zero a default is
-	 * used.  Ditto for the default soft and hard limit values (already
-	 * done, above), and for warnings.
-	 *
-	 * For other IDs, userspace can bump out the grace period if over
-	 * the soft limit.
-	 */
-	if (newlim->d_fieldmask & QC_SPC_TIMER)
-		dqp->q_blk.timer = newlim->d_spc_timer;
+		xfs_setqlim_warns(res, dres, newlim->d_ino_warns);
  	if (newlim->d_fieldmask & QC_INO_TIMER)
-		dqp->q_ino.timer = newlim->d_ino_timer;
-	if (newlim->d_fieldmask & QC_RT_SPC_TIMER)
-		dqp->q_rtb.timer = newlim->d_rt_spc_timer;
-
-	if (id == 0) {
-		if (newlim->d_fieldmask & QC_SPC_TIMER)
-			defq->dfq_blk.timelimit = newlim->d_spc_timer;
-		if (newlim->d_fieldmask & QC_INO_TIMER)
-			defq->dfq_ino.timelimit = newlim->d_ino_timer;
-		if (newlim->d_fieldmask & QC_RT_SPC_TIMER)
-			defq->dfq_rtb.timelimit = newlim->d_rt_spc_timer;
-	}
+		xfs_setqlim_timer(res, dres, newlim->d_ino_timer);
if (id != 0) {
  		/*




[Index of Archives]     [XFS Filesystem Development (older mail)]     [Linux Filesystem Development]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux RAID]     [Linux SCSI]


  Powered by Linux