diff options
| author | Oleg Nesterov <oleg@redhat.com> | 2010-04-30 07:23:51 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-04-30 07:24:51 +0200 |
| commit | 47dd5be2d6a82b8153e059a1d09eb3879d485bfd (patch) | |
| tree | 8d67407e8c3e00d303bd59bf97ecad5d08b4dd19 /kernel/workqueue.c | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
| download | op-kernel-dev-47dd5be2d6a82b8153e059a1d09eb3879d485bfd.zip op-kernel-dev-47dd5be2d6a82b8153e059a1d09eb3879d485bfd.tar.gz | |
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>
Diffstat (limited to 'kernel/workqueue.c')
| -rw-r--r-- | kernel/workqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index dee4865..5bfb213 100644 --- 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(); } |
