Commit 534a3fbb authored Apr 18, 2014 by Daeseok Youn Committed by Tejun Heo Apr 18, 2014

workqueue: simplify wq_update_unbound_numa() by jumping to use_dfl_pwq if the...

workqueue: simplify wq_update_unbound_numa() by jumping to use_dfl_pwq if the target cpumask equals wq's

wq_update_unbound_numa(), when it's decided that the newly updated
cpumask equals the default, looks at whether the current pwq is
already the default one and skips setting pwq to the default one.
This extra step is unnecessary and we can always jump to use_dfl_pwq
instead. Simplify the code by removing the conditional.
This doesn't make any functional difference.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>

parent 77668c8b

kernel/workqueue.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -4103,16 +4103,12 @@ static void wq_update_unbound_numa(struct workqueue_struct *wq, int cpu,
		* Let's determine what needs to be done. If the target cpumask is
		* different from wq's, we need to compare it to @pwq's and create
		* a new one if they don't match. If the target cpumask equals
		* wq's, the default pwq should be used. If @pwq is already the
		* default one, nothing to do; otherwise, install the default one.
		* wq's, the default pwq should be used.
		*/
		if (wq_calc_node_cpumask(wq->unbound_attrs, node, cpu_off, cpumask)) {
		if (cpumask_equal(cpumask, pwq->pool->attrs->cpumask))
		goto out_unlock;
		} else {
		if (pwq == wq->dfl_pwq)
		goto out_unlock;
		else
		goto use_dfl_pwq;
		}

Admin message