Commit dbcbc7b9 authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: refactor testing if a particular dquot is being enforced

Create a small helper to test if enforcement is enabled for a
given incore dquot and replace the open-code logic testing.
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 8cd4901d
...@@ -156,6 +156,23 @@ static inline struct xfs_dquot *xfs_inode_dquot(struct xfs_inode *ip, int type) ...@@ -156,6 +156,23 @@ static inline struct xfs_dquot *xfs_inode_dquot(struct xfs_inode *ip, int type)
} }
} }
/* Decide if the dquot's limits are actually being enforced. */
static inline bool
xfs_dquot_is_enforced(
const struct xfs_dquot *dqp)
{
switch (dqp->dq_flags & XFS_DQTYPE_REC_MASK) {
case XFS_DQTYPE_USER:
return XFS_IS_UQUOTA_ENFORCED(dqp->q_mount);
case XFS_DQTYPE_GROUP:
return XFS_IS_GQUOTA_ENFORCED(dqp->q_mount);
case XFS_DQTYPE_PROJ:
return XFS_IS_PQUOTA_ENFORCED(dqp->q_mount);
}
ASSERT(0);
return false;
}
/* /*
* Check whether a dquot is under low free space conditions. We assume the quota * Check whether a dquot is under low free space conditions. We assume the quota
* is enabled and enforced. * is enabled and enforced.
......
...@@ -660,19 +660,14 @@ xfs_qm_scall_getquota_fill_qc( ...@@ -660,19 +660,14 @@ xfs_qm_scall_getquota_fill_qc(
* gets turned off. No need to confuse the user level code, * gets turned off. No need to confuse the user level code,
* so return zeroes in that case. * so return zeroes in that case.
*/ */
if ((!XFS_IS_UQUOTA_ENFORCED(mp) && type == XFS_DQTYPE_USER) || if (!xfs_dquot_is_enforced(dqp)) {
(!XFS_IS_GQUOTA_ENFORCED(mp) && type == XFS_DQTYPE_GROUP) ||
(!XFS_IS_PQUOTA_ENFORCED(mp) && type == XFS_DQTYPE_PROJ)) {
dst->d_spc_timer = 0; dst->d_spc_timer = 0;
dst->d_ino_timer = 0; dst->d_ino_timer = 0;
dst->d_rt_spc_timer = 0; dst->d_rt_spc_timer = 0;
} }
#ifdef DEBUG #ifdef DEBUG
if (((XFS_IS_UQUOTA_ENFORCED(mp) && type == XFS_DQTYPE_USER) || if (xfs_dquot_is_enforced(dqp) && dqp->q_id != 0) {
(XFS_IS_GQUOTA_ENFORCED(mp) && type == XFS_DQTYPE_GROUP) ||
(XFS_IS_PQUOTA_ENFORCED(mp) && type == XFS_DQTYPE_PROJ)) &&
dqp->q_id != 0) {
if ((dst->d_space > dst->d_spc_softlimit) && if ((dst->d_space > dst->d_spc_softlimit) &&
(dst->d_spc_softlimit > 0)) { (dst->d_spc_softlimit > 0)) {
ASSERT(dst->d_spc_timer != 0); ASSERT(dst->d_spc_timer != 0);
......
...@@ -650,9 +650,7 @@ xfs_trans_dqresv( ...@@ -650,9 +650,7 @@ xfs_trans_dqresv(
} }
if ((flags & XFS_QMOPT_FORCE_RES) == 0 && dqp->q_id && if ((flags & XFS_QMOPT_FORCE_RES) == 0 && dqp->q_id &&
((XFS_IS_UQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISUDQ(dqp)) || xfs_dquot_is_enforced(dqp)) {
(XFS_IS_GQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISGDQ(dqp)) ||
(XFS_IS_PQUOTA_ENFORCED(dqp->q_mount) && XFS_QM_ISPDQ(dqp)))) {
int quota_nl; int quota_nl;
bool fatal; bool fatal;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment