On Mon, Feb 12, 2018 at 03:06:58PM -0600, Eric Sandeen wrote:
> On 2/5/18 5:23 PM, Darrick J. Wong wrote:
> > From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> >
> > Move all the printing of the scrub outcome into a separate helper to
> > declutter the main function.
> >
> > Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
>
>
> This might get a bit long, no?
>
> "/path/to/filesystem: errors found 16384; warnings found 16. Unmount and run xfs_repair."
>
> Can we put the "Unmount and run xfs_repair" on its own line?
> That'd make it stand out more, as well. </nitpick>
Sure, works for me. Should I send a separate patch or will you just fix
it up on the way in?
--D
>
> > ---
> > scrub/xfs_scrub.c | 48 ++++++++++++++++++++++++++++++------------------
> > 1 file changed, 30 insertions(+), 18 deletions(-)
> >
> >
> > diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
> > index 89b7fa0..fdd35df 100644
> > --- a/scrub/xfs_scrub.c
> > +++ b/scrub/xfs_scrub.c
> > @@ -493,6 +493,34 @@ _("Scrub aborted after phase %d."),
> > return moveon;
> > }
> >
> > +static void
> > +report_outcome(
> > + struct scrub_ctx *ctx)
> > +{
> > + unsigned long long total_errors;
> > +
> > + total_errors = ctx->errors_found + ctx->runtime_errors;
> > +
> > + if (total_errors == 0 && ctx->warnings_found == 0)
> > + return;
> > +
> > + if (total_errors == 0)
> > + fprintf(stderr, _("%s: warnings found: %llu."), ctx->mntpoint,
> > + ctx->warnings_found);
> > + else if (ctx->warnings_found == 0)
> > + fprintf(stderr, _("%s: errors found: %llu."), ctx->mntpoint,
> > + total_errors);
> > + else
> > + fprintf(stderr, _("%s: errors found: %llu; warnings found: %llu."),
> > + ctx->mntpoint, total_errors,
> > + ctx->warnings_found);
> > +
> > + if (ctx->need_repair)
> > + fprintf(stderr, " %s\n", _("Unmount and run xfs_repair."));
> > + else
> > + fprintf(stderr, "\n");
> > +}
> > +
> > int
> > main(
> > int argc,
> > @@ -501,9 +529,7 @@ main(
> > struct scrub_ctx ctx = {0};
> > struct phase_rusage all_pi;
> > char *mtab = NULL;
> > - char *repairstr = "";
> > FILE *progress_fp = NULL;
> > - unsigned long long total_errors;
> > bool moveon = true;
> > bool ismnt;
> > int c;
> > @@ -692,22 +718,8 @@ _("%s: Not a XFS mount point or block device.\n"),
> > ctx.runtime_errors++;
> >
> > out:
> > - total_errors = ctx.errors_found + ctx.runtime_errors;
> > - if (ctx.need_repair)
> > - repairstr = _(" Unmount and run xfs_repair.");
> > - if (total_errors && ctx.warnings_found)
> > - fprintf(stderr,
> > -_("%s: %llu errors and %llu warnings found.%s\n"),
> > - ctx.mntpoint, total_errors, ctx.warnings_found,
> > - repairstr);
> > - else if (total_errors && ctx.warnings_found == 0)
> > - fprintf(stderr,
> > -_("%s: %llu errors found.%s\n"),
> > - ctx.mntpoint, total_errors, repairstr);
> > - else if (total_errors == 0 && ctx.warnings_found)
> > - fprintf(stderr,
> > -_("%s: %llu warnings found.\n"),
> > - ctx.mntpoint, ctx.warnings_found);
> > + report_outcome(&ctx);
> > +
> > if (ctx.errors_found) {
> > if (ctx.error_action == ERRORS_SHUTDOWN)
> > xfs_shutdown_fs(&ctx);
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
