xfs_scrub: don't retry unsupported optimizations

If the kernel says it doesn't support optimizing a data structure, we
should mark it done and move on.  This is much better than requeuing the
repair, in which case it will likely keep failing.  Eventually these
requeued repairs end up in the single-threaded last resort at the end of
phase 4, which makes things /very/ slow.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/scrub/scrub.c b/scrub/scrub.c
index e83d0d9ce99b0594ea3f28d887833a75ffee1101..1a4506875f737ffee5e1c4e978e352b04e93ea5f 100644 (file)
--- a/scrub/scrub.c
+++ b/scrub/scrub.c
@@ -668,6 +668,15 @@ _("Filesystem is shut down, aborting."));
                return CHECK_ABORT;
        case ENOTTY:
        case EOPNOTSUPP:
+               /*
+                * If the kernel cannot perform the optimization that we
+                * requested; or we forced a repair but the kernel doesn't know
+                * how to perform the repair, don't requeue the request.  Mark
+                * it done and move on.
+                */
+               if (is_unoptimized(&oldm) ||
+                   debug_tweak_on("XFS_SCRUB_FORCE_REPAIR"))
+                       return CHECK_DONE;
                /*
                 * If we're in no-complain mode, requeue the check for
                 * later.  It's possible that an error in another
@@ -678,13 +687,6 @@ _("Filesystem is shut down, aborting."));
                 */
                if (!(repair_flags & XRM_COMPLAIN_IF_UNFIXED))
                        return CHECK_RETRY;
-               /*
-                * If we forced repairs or this is a preen, don't
-                * error out if the kernel doesn't know how to fix.
-                */
-               if (is_unoptimized(&oldm) ||
-                   debug_tweak_on("XFS_SCRUB_FORCE_REPAIR"))
-                       return CHECK_DONE;
                fallthrough;
        case EINVAL:
                /* Kernel doesn't know how to repair this? */