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 6efcf77e93cc62b4d85e2792830a732f072846cb..89b7fa0eca68344c942ededd35af9e198f462848 100644 (file)
--- 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,