xfs_scrub: rename the global nr_threads

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@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/scrub/common.c b/scrub/common.c
index 78afc4bff8c48c931b814c6c307c853a9f6f9e05..c877c7c8f00e1d059bfe181fba40c7990c860058 100644 (file)
--- 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 7daa508e68ef5a9196881e028a89562f2b067c1f..dd1095331d235258b2d7b690d79235eb87569581 100644 (file)
--- 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 b81380001fa04111297dec057ecfb12a6fd19d80..71fc274f58e7eddfd2f5465715706bf028342029 100644 (file)
--- 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 a961d8fd262e0788c7c07820373f553941a02c6c..a459e4b5765574a5e681fef94b59e7cbc278a8bf 100644 (file)
--- 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;