xfs_scrub: rename nr_io_threads

This variable really describes the number of threads that we should
start up to scan metadata.  Rename it to reduce confusion with the media
verification code, which also initiates IO.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/scrub/common.c b/scrub/common.c
index 34d91525928305206b7c9add6bbd4fbe0f46f7ca..95bc0c091eae270656a72346f8cb97e2cc8a3cbe 100644 (file)
--- a/scrub/common.c
+++ b/scrub/common.c
@@ -275,7 +275,7 @@ scrub_nproc(
 {
        if (force_nr_threads)
                return force_nr_threads;
-       return ctx->nr_io_threads;
+       return ctx->nr_scan_threads;
 }
 
 /*

diff --git a/scrub/phase1.c b/scrub/phase1.c
index 954a62b7e8d7116f98e9f80ccbb55f0914d3ced1..16607af4c5f025947c0a4378fcc5b7c1c3aa51d8 100644 (file)
--- a/scrub/phase1.c
+++ b/scrub/phase1.c
@@ -355,7 +355,7 @@ _("Unable to find realtime device path."));
                return ECANCELED;
        }
 
-       ctx->nr_io_threads = disk_heads(ctx->verify_disks[XFS_DEV_DATA]);
+       ctx->nr_scan_threads = disk_heads(ctx->verify_disks[XFS_DEV_DATA]);
        if (verbose) {
                fprintf(stdout, _("%s: using %d threads to scrub.\n"),
                                ctx->mntpoint, scrub_nproc(ctx));

diff --git a/scrub/xfs_scrub.h b/scrub/xfs_scrub.h
index a7e67c37469beb9c5915a042d7d24e7f00ff0ff0..3009a7cd2d97d06de261fb24673eb8ee7ae11ae2 100644 (file)
--- a/scrub/xfs_scrub.h
+++ b/scrub/xfs_scrub.h
@@ -70,7 +70,7 @@ struct scrub_ctx {
        struct xfs_fd           mnt;
 
        /* Number of threads for metadata scrubbing */
-       unsigned int            nr_io_threads;
+       unsigned int            nr_scan_threads;
 
        /* XFS specific geometry */
        struct fs_path          fsinfo;