From: Darrick J. Wong <djwong@kernel.org>
Date: Mon, 7 Nov 2022 01:03:17 +0000 (-0800)
Subject: xfs: fix return code when fatal signal encountered during dquot scrub
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0a713bd41ea2b19904232b9c5278012c4361bc04;p=linux.git

xfs: fix return code when fatal signal encountered during dquot scrub

If the scrub process is sent a fatal signal while we're checking dquots,
the predicate for this will set the error code to -EINTR.  Don't then
squash that into -ECANCELED, because the wrong errno turns up in the
trace output.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
---

diff --git a/fs/xfs/scrub/quota.c b/fs/xfs/scrub/quota.c
index 21b4c90068591..0b643ff32b222 100644
--- a/fs/xfs/scrub/quota.c
+++ b/fs/xfs/scrub/quota.c
@@ -84,7 +84,7 @@ xchk_quota_item(
 	int			error = 0;
 
 	if (xchk_should_terminate(sc, &error))
-		return -ECANCELED;
+		return error;
 
 	/*
 	 * Except for the root dquot, the actual dquot we got must either have