Re: [PATCH 16/17] xfs: move xfs_dquot_tree calls into xfs_qm_dqget_cache_{lookup,insert}

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

On Mon, Oct 13, 2025 at 11:48:17AM +0900, Christoph Hellwig wrote:
> These are the low-level functions that needs them, so localize the
> (trivial) calculation of the radix tree root there.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Much cleaner, thanks for doing this.
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  fs/xfs/xfs_dquot.c | 24 +++++++++++-------------
>  1 file changed, 11 insertions(+), 13 deletions(-)
> 
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index 98593b380e94..29f578d66230 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -801,10 +801,11 @@ xfs_dq_get_next_id(
>  static struct xfs_dquot *
>  xfs_qm_dqget_cache_lookup(
>  	struct xfs_mount	*mp,
> -	struct xfs_quotainfo	*qi,
> -	struct radix_tree_root	*tree,
> -	xfs_dqid_t		id)
> +	xfs_dqid_t		id,
> +	xfs_dqtype_t		type)
>  {
> +	struct xfs_quotainfo	*qi = mp->m_quotainfo;
> +	struct radix_tree_root	*tree = xfs_dquot_tree(qi, type);
>  	struct xfs_dquot	*dqp;
>  
>  restart:
> @@ -843,11 +844,12 @@ xfs_qm_dqget_cache_lookup(
>  static int
>  xfs_qm_dqget_cache_insert(
>  	struct xfs_mount	*mp,
> -	struct xfs_quotainfo	*qi,
> -	struct radix_tree_root	*tree,
>  	xfs_dqid_t		id,
> +	xfs_dqtype_t		type,
>  	struct xfs_dquot	*dqp)
>  {
> +	struct xfs_quotainfo	*qi = mp->m_quotainfo;
> +	struct radix_tree_root	*tree = xfs_dquot_tree(qi, type);
>  	unsigned int		nofs_flags;
>  	int			error;
>  
> @@ -906,8 +908,6 @@ xfs_qm_dqget(
>  	bool			can_alloc,
>  	struct xfs_dquot	**O_dqpp)
>  {
> -	struct xfs_quotainfo	*qi = mp->m_quotainfo;
> -	struct radix_tree_root	*tree = xfs_dquot_tree(qi, type);
>  	struct xfs_dquot	*dqp;
>  	int			error;
>  
> @@ -916,7 +916,7 @@ xfs_qm_dqget(
>  		return error;
>  
>  restart:
> -	dqp = xfs_qm_dqget_cache_lookup(mp, qi, tree, id);
> +	dqp = xfs_qm_dqget_cache_lookup(mp, id, type);
>  	if (dqp)
>  		goto found;
>  
> @@ -924,7 +924,7 @@ xfs_qm_dqget(
>  	if (error)
>  		return error;
>  
> -	error = xfs_qm_dqget_cache_insert(mp, qi, tree, id, dqp);
> +	error = xfs_qm_dqget_cache_insert(mp, id, type, dqp);
>  	if (error) {
>  		/*
>  		 * Duplicate found. Just throw away the new dquot and start
> @@ -994,8 +994,6 @@ xfs_qm_dqget_inode(
>  	struct xfs_dquot	**dqpp)
>  {
>  	struct xfs_mount	*mp = ip->i_mount;
> -	struct xfs_quotainfo	*qi = mp->m_quotainfo;
> -	struct radix_tree_root	*tree = xfs_dquot_tree(qi, type);
>  	struct xfs_dquot	*dqp;
>  	xfs_dqid_t		id;
>  	int			error;
> @@ -1014,7 +1012,7 @@ xfs_qm_dqget_inode(
>  	id = xfs_qm_id_for_quotatype(ip, type);
>  
>  restart:
> -	dqp = xfs_qm_dqget_cache_lookup(mp, qi, tree, id);
> +	dqp = xfs_qm_dqget_cache_lookup(mp, id, type);
>  	if (dqp)
>  		goto found;
>  
> @@ -1050,7 +1048,7 @@ xfs_qm_dqget_inode(
>  		return -ESRCH;
>  	}
>  
> -	error = xfs_qm_dqget_cache_insert(mp, qi, tree, id, dqp);
> +	error = xfs_qm_dqget_cache_insert(mp, id, type, dqp);
>  	if (error) {
>  		/*
>  		 * Duplicate found. Just throw away the new dquot and start
> -- 
> 2.47.3
> 
>