Commit d160a58d authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Tejun Heo
Browse files

workqueue: Remove the arguments @hotplug_cpu and @online from wq_update_pod() 



The arguments @hotplug_cpu and @online are not used in wq_update_pod()
since the functions called by wq_update_pod() don't need them.

Signed-off-by: default avatarLai Jiangshan <jiangshan.ljs@antgroup.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 88a41b18

kernel/workqueue.c

+5 −8
Original line number Diff line number Diff line
@@ -5344,8 +5344,6 @@ int apply_workqueue_attrs(struct workqueue_struct *wq, 
 * wq_update_pod - update pod affinity of a wq for CPU hot[un]plug

 * @wq: the target workqueue

 * @cpu: the CPU to update pool association for

 * @hotplug_cpu: the CPU coming up or going down

 * @online: whether @cpu is coming up or going down

 *

 * This function is to be called from %CPU_DOWN_PREPARE, %CPU_ONLINE and

 * %CPU_DOWN_FAILED.  @cpu is being hot[un]plugged, update pod affinity of
@@ -5362,8 +5360,7 @@ int apply_workqueue_attrs(struct workqueue_struct *wq, 
 * CPU_DOWN. If a workqueue user wants strict affinity, it's the user's

 * responsibility to flush the work item from CPU_DOWN_PREPARE.

 */

static void wq_update_pod(struct workqueue_struct *wq, int cpu,

			  int hotplug_cpu, bool online)

static void wq_update_pod(struct workqueue_struct *wq, int cpu)

{

	struct pool_workqueue *old_pwq = NULL, *pwq;

	struct workqueue_attrs *target_attrs;
@@ -6584,7 +6581,7 @@ int workqueue_online_cpu(unsigned int cpu) 
			int tcpu;



			for_each_cpu(tcpu, pt->pod_cpus[pt->cpu_pod[cpu]])

				wq_update_pod(wq, tcpu, cpu, true);

				wq_update_pod(wq, tcpu);



			mutex_lock(&wq->mutex);

			wq_update_node_max_active(wq, -1);
@@ -6619,7 +6616,7 @@ int workqueue_offline_cpu(unsigned int cpu) 
			int tcpu;



			for_each_cpu(tcpu, pt->pod_cpus[pt->cpu_pod[cpu]])

				wq_update_pod(wq, tcpu, cpu, false);

				wq_update_pod(wq, tcpu);



			mutex_lock(&wq->mutex);

			wq_update_node_max_active(wq, cpu);
@@ -6908,7 +6905,7 @@ static int wq_affn_dfl_set(const char *val, const struct kernel_param *kp) 


	list_for_each_entry(wq, &workqueues, list) {

		for_each_online_cpu(cpu) {

			wq_update_pod(wq, cpu, cpu, true);

			wq_update_pod(wq, cpu);

		}

	}
@@ -7927,7 +7924,7 @@ void __init workqueue_init_topology(void) 
	 */

	list_for_each_entry(wq, &workqueues, list) {

		for_each_online_cpu(cpu)

			wq_update_pod(wq, cpu, cpu, true);

			wq_update_pod(wq, cpu);

		if (wq->flags & WQ_UNBOUND) {

			mutex_lock(&wq->mutex);

			wq_update_node_max_active(wq, -1);