From: Allison Collins <allison.henderson@oracle.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>, sandeen@sandeen.net
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 3/3] xfs_scrub: relabel verified data block counts in output
Date: Thu, 12 Sep 2019 16:42:36 -0700 [thread overview]
Message-ID: <adf29487-d3d9-4f84-3af2-2934dfb0a6c4@oracle.com> (raw)
In-Reply-To: <156774125207.2646704.16836517557282368220.stgit@magnolia>
Ok, you can add my review:
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
On 9/5/19 8:40 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Relabel the count of verified data blocks to make it more obvious that
> we were only looking for file data.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> scrub/phase7.c | 13 ++++++++-----
> scrub/xfs_scrub.c | 2 ++
> 2 files changed, 10 insertions(+), 5 deletions(-)
>
>
> diff --git a/scrub/phase7.c b/scrub/phase7.c
> index 570ceb3f..2622bc45 100644
> --- a/scrub/phase7.c
> +++ b/scrub/phase7.c
> @@ -116,6 +116,7 @@ xfs_scan_summary(
> unsigned long long f_free;
> bool moveon;
> bool complain;
> + bool scrub_all = scrub_data > 1;
> int ip;
> int error;
>
> @@ -244,14 +245,15 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"),
> }
>
> /*
> - * Complain if the checked block counts are off, which
> + * Complain if the data file verification block counts are off, which
> * implies an incomplete check.
> */
> - if (ctx->bytes_checked &&
> + if (scrub_data &&
> (verbose ||
> !within_range(ctx, used_data + used_rt,
> ctx->bytes_checked, absdiff, 1, 10,
> - _("verified blocks")))) {
> + scrub_all ? _("verified blocks") :
> + _("verified file data blocks")))) {
> double b1, b2;
> char *b1u, *b2u;
>
> @@ -262,8 +264,9 @@ _("%.*f%s inodes counted; %.*f%s inodes checked.\n"),
>
> b1 = auto_space_units(used_data + used_rt, &b1u);
> b2 = auto_space_units(ctx->bytes_checked, &b2u);
> - fprintf(stdout,
> -_("%.1f%s data counted; %.1f%s data verified.\n"),
> + fprintf(stdout, scrub_all ?
> +_("%.1f%s data counted; %.1f%s disk media verified.\n") :
> +_("%.1f%s data counted; %.1f%s file data media verified.\n"),
> b1, b1u, b2, b2u);
> fflush(stdout);
> }
> diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
> index 46876522..89f6c96a 100644
> --- a/scrub/xfs_scrub.c
> +++ b/scrub/xfs_scrub.c
> @@ -432,6 +432,8 @@ run_scrub_phases(
> /* Turn on certain phases if user said to. */
> if (sp->fn == DATASCAN_DUMMY_FN && scrub_data) {
> sp->fn = xfs_scan_blocks;
> + if (scrub_data > 1)
> + sp->descr = _("Verify disk integrity.");
> } else if (sp->fn == REPAIR_DUMMY_FN &&
> ctx->mode == SCRUB_MODE_REPAIR) {
> sp->descr = _("Repair filesystem.");
>
next prev parent reply other threads:[~2019-09-12 23:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-06 3:40 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong
2019-09-06 3:40 ` [PATCH 1/3] xfs_scrub: implement background mode for phase 6 Darrick J. Wong
2019-09-12 23:42 ` Allison Collins
2019-09-06 3:40 ` [PATCH 2/3] xfs_scrub: perform media scans of entire devices Darrick J. Wong
2019-09-12 23:42 ` Allison Collins
2019-09-06 3:40 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong
2019-09-12 23:42 ` Allison Collins [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-10-22 18:49 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong
2019-10-22 18:50 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong
2019-09-25 21:37 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong
2019-09-25 21:38 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong
2019-08-26 21:32 [PATCH 0/3] xfs_scrub: media scan entire disks Darrick J. Wong
2019-08-26 21:33 ` [PATCH 3/3] xfs_scrub: relabel verified data block counts in output Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=adf29487-d3d9-4f84-3af2-2934dfb0a6c4@oracle.com \
--to=allison.henderson@oracle.com \
--cc=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).