| Message ID | 166473479539.1083393.2779029008005184154.stgit@magnolia (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | xfs: fix incorrect return values in online fsck | expand |
On Sun, Oct 02, 2022 at 11:19:55AM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <djwong@kernel.org> > > 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> > --- > fs/xfs/scrub/quota.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > > diff --git a/fs/xfs/scrub/quota.c b/fs/xfs/scrub/quota.c > index 21b4c9006859..0b643ff32b22 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; *nod* Reviewed-by: Dave Chinner <dchinner@redhat.com>
diff --git a/fs/xfs/scrub/quota.c b/fs/xfs/scrub/quota.c index 21b4c9006859..0b643ff32b22 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