Re: [PATCH 1/2] xfs: fully decouple XFS_IBULK* flags from XFS_IWALK* flags

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

On Wed, Jul 23, 2025 at 02:19:44PM +0200, Christoph Hellwig wrote:
> Fix up xfs_inumbers to now pass in the XFS_IBULK* flags into the flags
> argument to xfs_inobt_walk, which expects the XFS_IWALK* flags.
> 
> Currently passing the wrong flags works for non-debug builds because
> the only XFS_IWALK* flag has the same encoding as the corresponding
> XFS_IBULK* flag, but in debug builds it can trigger an assert that no
> incorrect flag is passed.  Instead just extra the relevant flag.
> 
> Fixes: 5b35d922c52798 ("xfs: Decouple XFS_IBULK flags from XFS_IWALK flags")
> Reported-by: cen zhang <zzzccc427@gmail.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

I'd prefer this come with the
Cc: <stable@vger.kernel.org> # v5.19
so that I don't have to manually backport this to 6.12

Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

> ---
>  fs/xfs/xfs_itable.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
> index c8c9b8d8309f..5116842420b2 100644
> --- a/fs/xfs/xfs_itable.c
> +++ b/fs/xfs/xfs_itable.c
> @@ -447,17 +447,21 @@ xfs_inumbers(
>  		.breq		= breq,
>  	};
>  	struct xfs_trans	*tp;
> +	unsigned int		iwalk_flags = 0;
>  	int			error = 0;
>  
>  	if (xfs_bulkstat_already_done(breq->mp, breq->startino))
>  		return 0;
>  
> +	if (breq->flags & XFS_IBULK_SAME_AG)
> +		iwalk_flags |= XFS_IWALK_SAME_AG;
> +
>  	/*
>  	 * Grab an empty transaction so that we can use its recursive buffer
>  	 * locking abilities to detect cycles in the inobt without deadlocking.
>  	 */
>  	tp = xfs_trans_alloc_empty(breq->mp);
> -	error = xfs_inobt_walk(breq->mp, tp, breq->startino, breq->flags,
> +	error = xfs_inobt_walk(breq->mp, tp, breq->startino, iwalk_flags,
>  			xfs_inumbers_walk, breq->icount, &ic);
>  	xfs_trans_cancel(tp);
>  
> -- 
> 2.47.2
> 
>