From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Mon, 12 Feb 2018 21:47:56 +0000 (-0600)
Subject: xfs_scrub: always init phase information
X-Git-Tag: v4.15.0-rc1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e4959c1c632c5faf5efff445429d3a4a5089f27;p=thirdparty%2Fxfsprogs-dev.git

xfs_scrub: always init phase information

Make sure we initialize the overall phase state before we start
executing any code that can end up in the report-status-and-exit paths.
Otherwise if debugging is turned on we get garbage io/cpu stat reports.

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 6efcf77e9..89b7fa0ec 100644
--- a/scrub/xfs_scrub.c
+++ b/scrub/xfs_scrub.c
@@ -618,6 +618,11 @@ main(
 	if (getenv("SERVICE_MODE"))
 		is_service = true;
 
+	/* Initialize overall phase stats. */
+	moveon = phase_start(&all_pi, 0, NULL);
+	if (!moveon)
+		return SCRUB_RET_OPERROR;
+
 	/* Find the mount record for the passed-in argument. */
 	if (stat(argv[optind], &ctx.mnt_sb) < 0) {
 		fprintf(stderr,
@@ -641,11 +646,6 @@ main(
 			mtab = _PATH_MOUNTED;
 	}
 
-	/* Initialize overall phase stats. */
-	moveon = phase_start(&all_pi, 0, NULL);
-	if (!moveon)
-		goto out;
-
 	ismnt = find_mountpoint(mtab, &ctx);
 	if (!ismnt) {
 		fprintf(stderr,