Re: [PATCH 04/17] xfs: don't lock the dquot before return in xrep_quota_item

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

On Mon, Oct 13, 2025 at 11:48:05AM +0900, Christoph Hellwig wrote:
> While xfs_qm_dqput requires the dquot to be locked, the caller can use
> the more common xfs_qm_dqrele helper that takes care of locking the
> dquot instead.

Similar problem here -- there are other paths out of xrep_quota_item
that return with the dqlock held, and the new xfs_qm_dqrele will try to
re-take the lock and livelock.

--D

> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  fs/xfs/scrub/quota_repair.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/xfs/scrub/quota_repair.c b/fs/xfs/scrub/quota_repair.c
> index 8c89c6cc2950..00a4d2e75797 100644
> --- a/fs/xfs/scrub/quota_repair.c
> +++ b/fs/xfs/scrub/quota_repair.c
> @@ -257,9 +257,7 @@ xrep_quota_item(
>  		xfs_qm_adjust_dqtimers(dq);
>  	}
>  	xfs_trans_log_dquot(sc->tp, dq);
> -	error = xfs_trans_roll(&sc->tp);
> -	mutex_lock(&dq->q_qlock);
> -	return error;
> +	return xfs_trans_roll(&sc->tp);
>  }
>  
>  /* Fix a quota timer so that we can pass the verifier. */
> @@ -513,7 +511,7 @@ xrep_quota_problems(
>  	xchk_dqiter_init(&cursor, sc, dqtype);
>  	while ((error = xchk_dquot_iter(&cursor, &dq)) == 1) {
>  		error = xrep_quota_item(&rqi, dq);
> -		xfs_qm_dqput(dq);
> +		xfs_qm_dqrele(dq);
>  		if (error)
>  			break;
>  	}
> -- 
> 2.47.3
> 
>