xfs_scrub: don't ask user to run xfs_repair for only warnings

Don't advise the user to run xfs_repair on a filesystem that triggers
warnings but no errors; there's no corruption for it to fix.

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/phase1.c b/scrub/phase1.c
index b856a7f508369fa1e5876cb6ac003d527447df8a..002c6425f9b116e0a6f2d63dfda77b0047052652 100644 (file)
--- a/scrub/phase1.c
+++ b/scrub/phase1.c
@@ -237,6 +237,6 @@ _("Unable to find realtime device path."));
         * purely setup errors).
         */
        log_info(ctx, _("Invoking online scrub."), ctx);
-       ctx->need_repair = true;
+       ctx->scrub_setup_succeeded = true;
        return true;
 }

diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
index 7ab0c3ee62aa6ce630bb62d4d648c4134b0ce976..7ee02b669f1426335f1d81f83b279dbdd927cf99 100644 (file)
--- a/scrub/xfs_scrub.c
+++ b/scrub/xfs_scrub.c
@@ -522,7 +522,12 @@ report_outcome(
                                total_errors, ctx->warnings_found);
        }
 
-       if (ctx->need_repair)
+       /*
+        * Don't advise the user to run repair unless we were successful in
+        * setting up the scrub and we actually saw corruptions.  Warnings
+        * are not corruptions.
+        */
+       if (ctx->scrub_setup_succeeded && total_errors > 0)
                fprintf(stderr, _("%s: Unmount and run xfs_repair.\n"),
                                ctx->mntpoint);
 }

diff --git a/scrub/xfs_scrub.h b/scrub/xfs_scrub.h
index b455747dd056589116259fbe244122812ab0cf29..aa130a73f2dcd91c3c0b9048dd0c836ca9e9caf6 100644 (file)
--- a/scrub/xfs_scrub.h
+++ b/scrub/xfs_scrub.h
@@ -96,7 +96,7 @@ struct scrub_ctx {
        unsigned long long      naming_warnings;
        unsigned long long      repairs;
        unsigned long long      preens;
-       bool                    need_repair;
+       bool                    scrub_setup_succeeded;
        bool                    preen_triggers[XFS_SCRUB_TYPE_NR];
 };