Commit d2845519 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Carlos Maiolino
Browse files

xfs: fully decouple XFS_IBULK* flags from XFS_IWALK* flags 



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: 5b35d922 ("xfs: Decouple XFS_IBULK flags from XFS_IWALK flags")
Cc: <stable@vger.kernel.org> # v5.19
Reported-by: default avatarcen zhang <zzzccc427@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarCarlos Maiolino <cem@kernel.org>
parent 647b3d59

fs/xfs/xfs_itable.c

+5 −1
Original line number Diff line number Diff line
@@ -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);