[1/3] xfs_scrub: bump work_threads to include the controller thread
diff mbox series

Message ID 157177018286.1460581.16476228375864117661.stgit@magnolia
State Accepted
Headers show
  • xfs_scrub: deferred labelling to save time
Related show

Commit Message

Darrick J. Wong Oct. 22, 2019, 6:49 p.m. UTC
From: Darrick J. Wong <darrick.wong@oracle.com>

Bump @work_threads in the scrub phase setup function because we will
soon want the main thread (i.e. the one that coordinates workers) to be
factored into per-thread data structures.  We'll need this in an
upcoming patch to render error string prefixes to preallocated
per-thread buffers.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
 scrub/xfs_scrub.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff mbox series

diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
index 963d0d70..fe76d075 100644
--- a/scrub/xfs_scrub.c
+++ b/scrub/xfs_scrub.c
@@ -458,6 +458,13 @@  run_scrub_phases(
 					&work_threads, &rshift);
 			if (!moveon)
+			/*
+			 * The thread that starts the worker threads is also
+			 * allowed to contribute to the progress counters and
+			 * whatever other per-thread data we need to allocate.
+			 */
+			work_threads++;
 			moveon = progress_init_phase(ctx, progress_fp, phase,
 					max_work, rshift, work_threads);
 		} else {