Commit 93b0c58e authored by Darrick J. Wong's avatar Darrick J. Wong

xfs: don't return -EFSCORRUPTED from repair when resources cannot be grabbed

If we tried to repair something but the repair failed with -EDEADLOCK,
that means that the repair function couldn't grab some resource it
needed and wants us to try again.  If we try again (with TRY_HARDER) but
still can't get all the resources we need, the repair fails and errors
remain on the filesystem.

Right now, repair returns the -EDEADLOCK to the caller as -EFSCORRUPTED,
which results in XFS_SCRUB_OFLAG_CORRUPT being passed out to userspace.
This is not correct because repair has not determined that anything is
corrupt.  If the repair had been invoked on an object that could be
optimized but wasn't corrupt (OFLAG_PREEN), the inability to grab
resources will be reported to userspace as corrupt metadata, and users
will be unnecessarily alarmed that their suboptimal metadata turned into
a corruption.

Fix this by returning zero so that the results of the actual scrub will
be copied back out to userspace.
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 6bf2f879
...@@ -69,9 +69,9 @@ xrep_attempt( ...@@ -69,9 +69,9 @@ xrep_attempt(
/* /*
* We tried harder but still couldn't grab all the resources * We tried harder but still couldn't grab all the resources
* we needed to fix it. The corruption has not been fixed, * we needed to fix it. The corruption has not been fixed,
* so report back to userspace. * so exit to userspace with the scan's output flags unchanged.
*/ */
return -EFSCORRUPTED; return 0;
default: default:
/* /*
* EAGAIN tells the caller to re-scrub, so we cannot return * EAGAIN tells the caller to re-scrub, so we cannot return
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment