From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Various functions have nr_threads local variables that shadow the global
one. Since the global one forces the number of threads we use, change
its name to remove this ambiguity and reflect what it really does.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
scrub/common.c | 4 ++--
scrub/disk.c | 4 ++--
scrub/xfs_scrub.c | 6 +++---
scrub/xfs_scrub.h | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/scrub/common.c b/scrub/common.c
index 78afc4bf..c877c7c8 100644
--- a/scrub/common.c
+++ b/scrub/common.c
@@ -231,8 +231,8 @@ unsigned int
scrub_nproc(
struct scrub_ctx *ctx)
{
- if (nr_threads)
- return nr_threads;
+ if (force_nr_threads)
+ return force_nr_threads;
return ctx->nr_io_threads;
}
diff --git a/scrub/disk.c b/scrub/disk.c
index 7daa508e..dd109533 100644
--- a/scrub/disk.c
+++ b/scrub/disk.c
@@ -75,8 +75,8 @@ unsigned int
disk_heads(
struct disk *disk)
{
- if (nr_threads)
- return nr_threads;
+ if (force_nr_threads)
+ return force_nr_threads;
return __disk_heads(disk);
}
diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
index b8138000..71fc274f 100644
--- a/scrub/xfs_scrub.c
+++ b/scrub/xfs_scrub.c
@@ -133,7 +133,7 @@ unsigned int bg_mode;
int nproc;
/* Number of threads we're allowed to use. */
-unsigned int nr_threads;
+unsigned int force_nr_threads;
/* Verbosity; higher values print more information. */
bool verbose;
@@ -589,7 +589,7 @@ main(
}
break;
case 'b':
- nr_threads = 1;
+ force_nr_threads = 1;
bg_mode++;
break;
case 'C':
@@ -659,7 +659,7 @@ main(
perror("nr_threads");
usage();
}
- nr_threads = x;
+ force_nr_threads = x;
}
if (optind != argc - 1)
diff --git a/scrub/xfs_scrub.h b/scrub/xfs_scrub.h
index a961d8fd..a459e4b5 100644
--- a/scrub/xfs_scrub.h
+++ b/scrub/xfs_scrub.h
@@ -10,7 +10,7 @@ extern char *progname;
#define _PATH_PROC_MOUNTS "/proc/mounts"
-extern unsigned int nr_threads;
+extern unsigned int force_nr_threads;
extern unsigned int bg_mode;
extern unsigned int debug;
extern int nproc;
