Re: [PATCH 4/7] xfs: fix termination logic in xchk_bmap

[Carlos Maiolino <cem@kernel.org>]

On Tue, Sep 08, 2026 at 11:05:21PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <djwong@kernel.org>
> 
> xchk_should_terminate can turn its @error argument into -EINTR if the
> user is sitting on ^C.  Unfortunately, this code here turns that into a
> 0 return, which isn't quite correct.  LOLLM complains about this, though
> I think it's a very minor matter because the only way -EINTR happens is
> if there's a fatal signal.
> 
> Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
> Assisted-by: LOLLM # finding obvious bugs
> ---

Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>

>  fs/xfs/scrub/bmap.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> 
> diff --git a/fs/xfs/scrub/bmap.c b/fs/xfs/scrub/bmap.c
> index 3b0f1dbd9147ac..4f3c7f681bd921 100644
> --- a/fs/xfs/scrub/bmap.c
> +++ b/fs/xfs/scrub/bmap.c
> @@ -1103,8 +1103,9 @@ xchk_bmap(
>  	 * the rmap must match the combined mapping exactly.
>  	 */
>  	while (xchk_bmap_iext_iter(&info, &irec)) {
> -		if (xchk_should_terminate(sc, &error) ||
> -		    (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT))
> +		if (xchk_should_terminate(sc, &error))
> +			return error;
> +		if (sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)
>  			return 0;
>  
>  		if (irec.br_startoff >= endoff) {
> 
>