Re: [PATCH 14/17] xfs: move q_qlock locking into xqcheck_compare_dquot

["Darrick J. Wong" <djwong@kernel.org>]

On Mon, Oct 13, 2025 at 11:48:15AM +0900, Christoph Hellwig wrote:
> Instead of having both callers do it.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Yay less lock cycling!
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  fs/xfs/scrub/quotacheck.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/xfs/scrub/quotacheck.c b/fs/xfs/scrub/quotacheck.c
> index 20220afd90f1..cc2b2dfc9261 100644
> --- a/fs/xfs/scrub/quotacheck.c
> +++ b/fs/xfs/scrub/quotacheck.c
> @@ -563,6 +563,7 @@ xqcheck_compare_dquot(
>  		return -ECANCELED;
>  	}
>  
> +	mutex_lock(&dq->q_qlock);
>  	mutex_lock(&xqc->lock);
>  	error = xfarray_load_sparse(counts, dq->q_id, &xcdq);
>  	if (error)
> @@ -590,6 +591,7 @@ xqcheck_compare_dquot(
>  		error = -ECANCELED;
>  	}
>  	mutex_unlock(&xqc->lock);
> +	mutex_unlock(&dq->q_qlock);
>  	if (error)
>  		return error;
>  
> @@ -635,9 +637,7 @@ xqcheck_walk_observations(
>  		if (error)
>  			return error;
>  
> -		mutex_lock(&dq->q_qlock);
>  		error = xqcheck_compare_dquot(xqc, dqtype, dq);
> -		mutex_unlock(&dq->q_qlock);
>  		xfs_qm_dqrele(dq);
>  		if (error)
>  			return error;
> @@ -675,9 +675,7 @@ xqcheck_compare_dqtype(
>  	/* Compare what we observed against the actual dquots. */
>  	xchk_dqiter_init(&cursor, sc, dqtype);
>  	while ((error = xchk_dquot_iter(&cursor, &dq)) == 1) {
> -		mutex_lock(&dq->q_qlock);
>  		error = xqcheck_compare_dquot(xqc, dqtype, dq);
> -		mutex_unlock(&dq->q_qlock);
>  		xfs_qm_dqrele(dq);
>  		if (error)
>  			break;
> -- 
> 2.47.3
> 
>