xfs: clean up scrub context if scrub setup returns -EDEADLOCK

It has been a longstanding convention that online scrub and repair
functions can return -EDEADLOCK to signal that they weren't able to
obtain some necessary resource.  When this happens, the scrub framework
is supposed to release all resources attached to the scrub context, set
the TRY_HARDER flag in the scrub context flags, and try again.  In this
context, individual scrub functions are supposed to take all the
resources they (incorrectly) speculated were not necessary.

We're about to make it so that the functions that lock and wait for a
filesystem AG can also return EDEADLOCK to signal that we need to try
again with the drain waiters enabled.  Therefore, refactor
xfs_scrub_metadata to support this behavior for ->setup() functions.

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

diff --git a/fs/xfs/scrub/scrub.c b/fs/xfs/scrub/scrub.c
index e8e2bee..9364fe7 100644 (file)
--- a/fs/xfs/scrub/scrub.c
+++ b/fs/xfs/scrub/scrub.c
@@ -491,23 +491,16 @@ retry_op:
 
        /* Set up for the operation. */
        error = sc->ops->setup(sc);
+       if (error == -EDEADLOCK && !(sc->flags & XCHK_TRY_HARDER))
+               goto try_harder;
        if (error)
                goto out_teardown;
 
        /* Scrub for errors. */
        error = sc->ops->scrub(sc);
-       if (!(sc->flags & XCHK_TRY_HARDER) && error == -EDEADLOCK) {
-               /*
-                * Scrubbers return -EDEADLOCK to mean 'try harder'.
-                * Tear down everything we hold, then set up again with
-                * preparation for worst-case scenarios.
-                */
-               error = xchk_teardown(sc, 0);
-               if (error)
-                       goto out_sc;
-               sc->flags |= XCHK_TRY_HARDER;
-               goto retry_op;
-       } else if (error || (sm->sm_flags & XFS_SCRUB_OFLAG_INCOMPLETE))
+       if (error == -EDEADLOCK && !(sc->flags & XCHK_TRY_HARDER))
+               goto try_harder;
+       if (error || (sm->sm_flags & XFS_SCRUB_OFLAG_INCOMPLETE))
                goto out_teardown;
 
        xchk_update_health(sc);
@@ -565,4 +558,15 @@ out:
                error = 0;
        }
        return error;
+try_harder:
+       /*
+        * Scrubbers return -EDEADLOCK to mean 'try harder'.  Tear down
+        * everything we hold, then set up again with preparation for
+        * worst-case scenarios.
+        */
+       error = xchk_teardown(sc, 0);
+       if (error)
+               goto out_sc;
+       sc->flags |= XCHK_TRY_HARDER;
+       goto retry_op;
 }