From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Fri, 1 Nov 2019 21:55:06 +0000 (-0400)
Subject: xfs_scrub: simplify post-run reporting logic
X-Git-Tag: v5.3.0-rc2~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5155653f70bc87fcb8d14320e17c311e502e7388;p=thirdparty%2Fxfsprogs-dev.git

xfs_scrub: simplify post-run reporting logic

Simplify the post-run error and warning reporting logic so that in
subsequent patches we can be more specific about what types of things
went wrong.

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 e9fc3650d..c73056945 100644
--- a/scrub/xfs_scrub.c
+++ b/scrub/xfs_scrub.c
@@ -516,24 +516,20 @@ report_outcome(
 	total_errors = ctx->errors_found + ctx->runtime_errors;
 
 	if (total_errors == 0 && ctx->warnings_found == 0) {
-		log_info(ctx, _("No errors found."));
+		log_info(ctx, _("No problems found."));
 		return;
 	}
 
-	if (total_errors == 0) {
-		fprintf(stderr, _("%s: warnings found: %llu\n"), ctx->mntpoint,
-				ctx->warnings_found);
-		log_warn(ctx, _("warnings found: %llu"), ctx->warnings_found);
-	} else if (ctx->warnings_found == 0) {
+	if (total_errors > 0) {
 		fprintf(stderr, _("%s: errors found: %llu\n"), ctx->mntpoint,
 				total_errors);
 		log_err(ctx, _("errors found: %llu"), total_errors);
-	} else {
-		fprintf(stderr, _("%s: errors found: %llu; warnings found: %llu\n"),
-				ctx->mntpoint, total_errors,
+	}
+
+	if (ctx->warnings_found > 0) {
+		fprintf(stderr, _("%s: warnings found: %llu\n"), ctx->mntpoint,
 				ctx->warnings_found);
-		log_err(ctx, _("errors found: %llu; warnings found: %llu"),
-				total_errors, ctx->warnings_found);
+		log_warn(ctx, _("warnings found: %llu"), ctx->warnings_found);
 	}
 
 	/*