Jelajahi Sumber

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

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 <oleg@redhat.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Oleg Nesterov 15 tahun lalu
induk
melakukan
47dd5be2d6
1 mengubah file dengan 1 tambahan dan 1 penghapusan
  1. 1 1
      kernel/workqueue.c

+ 1 - 1
kernel/workqueue.c

@@ -774,7 +774,7 @@ void flush_delayed_work(struct delayed_work *dwork)
 {
 {
 	if (del_timer_sync(&dwork->timer)) {
 	if (del_timer_sync(&dwork->timer)) {
 		struct cpu_workqueue_struct *cwq;
 		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);
 		__queue_work(cwq, &dwork->work);
 		put_cpu();
 		put_cpu();
 	}
 	}