xfs_scrub: lack of kernel support is not a service failure

Don't treat a lack of kernel support for scrubbing as an automated
service failure because we have not actually determined that there's
anything wrong with the filesystem.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
index a789b6f4cfb1710950766c38f99e509f31fbf210..b81380001fa04111297dec057ecfb12a6fd19d80 100644 (file)
--- a/scrub/xfs_scrub.c
+++ b/scrub/xfs_scrub.c
@@ -780,9 +780,15 @@ out:
         * for capturing all the log messages if the scrub fails, because the
         * fail service uses the service name to gather log messages for the
         * error report.
+        *
+        * Note: We don't count a lack of kernel support as a service failure
+        * because we haven't determined that there's anything wrong with the
+        * filesystem.
         */
        if (is_service) {
                sleep(2);
+               if (!ctx.scrub_setup_succeeded)
+                       return 0;
                if (ret != SCRUB_RET_SUCCESS)
                        return 1;
        }