workqueue: flush_delayed_work: keep the original workqueue for re-queueing

oleg-nesterov · htejun · commit 47dd5be2d6a8 · 2010-04-30T07:24:51.000+02:00
flush_delayed_work() always uses keventd_wq for re-queueing,
but it should use the workqueue this dwork was queued on.

Signed-off-by: Oleg Nesterov &lt;oleg@redhat.com&gt;
Signed-off-by: Tejun Heo &lt;tj@kernel.org&gt;
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
@@ -774,7 +774,7 @@ void flush_delayed_work(struct delayed_work *dwork)
 {
 	if (del_timer_sync(&dwork->timer)) {
 		struct cpu_workqueue_struct *cwq;
-		cwq = wq_per_cpu(keventd_wq, get_cpu());
+		cwq = wq_per_cpu(get_wq_data(&dwork->work)->wq, get_cpu());
 		__queue_work(cwq, &dwork->work);
 		put_cpu();
 	}

Original file line number	Diff line number	Diff line change
`@@ -774,7 +774,7 @@ void flush_delayed_work(struct delayed_work *dwork)`
`774`	`774`	`{`
`775`	`775`	`if (del_timer_sync(&dwork->timer)) {`
`776`	`776`	`struct cpu_workqueue_struct *cwq;`
`777`		`- cwq = wq_per_cpu(keventd_wq, get_cpu());`
	`777`	`+ cwq = wq_per_cpu(get_wq_data(&dwork->work)->wq, get_cpu());`
`778`	`778`	`__queue_work(cwq, &dwork->work);`
`779`	`779`	`put_cpu();`
`780`	`780`	`}`