[PATCH 1/2] workqueues: flush_delayed_work: keep the original workqueue for re-queueing

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Oleg Nesterov
Date: Thursday, April 29, 2010 - 12:45 pm

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>
---

 kernel/workqueue.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 34-rc1/kernel/workqueue.c~FDW_DONT_USE_KEVENT_WQ	2009-12-18 19:05:38.000000000 +0100
+++ 34-rc1/kernel/workqueue.c	2010-04-29 21:08:32.000000000 +0200
@@ -774,7 +774,7 @@ void flush_delayed_work(struct delayed_w
 {
 	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();
 	}

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 0/9] Suspend block api (version 5), =?UTF-8?q?Arve=20Hj= ..., (Tue Apr 27, 9:31 pm)
[PATCH 1/8] PM: Add suspend block api., =?UTF-8?q?Arve=20Hj= ..., (Tue Apr 27, 9:31 pm)
[PATCH 2/8] PM: suspend_block: Add driver to access suspen ..., =?UTF-8?q?Arve=20Hj= ..., (Tue Apr 27, 9:31 pm)
[PATCH 3/8] PM: suspend_block: Abort task freezing if a su ..., =?UTF-8?q?Arve=20Hj= ..., (Tue Apr 27, 9:31 pm)
[PATCH 4/8] PM: suspend_block: Add debugfs file, =?UTF-8?q?Arve=20Hj= ..., (Tue Apr 27, 9:31 pm)
[PATCH 5/8] PM: suspend_block: Add suspend_blocker stats, =?UTF-8?q?Arve=20Hj= ..., (Tue Apr 27, 9:31 pm)
[PATCH 6/8] PM: Add suspend blocking work., =?UTF-8?q?Arve=20Hj= ..., (Tue Apr 27, 9:31 pm)
[PATCH 7/8] Input: Block suspend while event queue is not ..., =?UTF-8?q?Arve=20Hj= ..., (Tue Apr 27, 9:31 pm)
[PATCH 8/8] power_supply: Block suspend while power supply ..., =?UTF-8?q?Arve=20Hj= ..., (Tue Apr 27, 9:31 pm)
Re: [PATCH 6/8] PM: Add suspend blocking work., Pavel Machek, (Tue Apr 27, 11:06 pm)
Re: [PATCH 1/8] PM: Add suspend block api., Pavel Machek, (Tue Apr 27, 11:07 pm)
Re: [PATCH 6/8] PM: Add suspend blocking work., Tejun Heo, (Tue Apr 27, 11:44 pm)
Re: [PATCH 6/8] PM: Add suspend blocking work., Arve Hjønnevåg, (Wed Apr 28, 12:02 am)
Re: [PATCH 6/8] PM: Add suspend blocking work., Tejun Heo, (Wed Apr 28, 12:18 am)
Re: [PATCH 6/8] PM: Add suspend blocking work., Oleg Nesterov, (Wed Apr 28, 12:40 pm)
Re: [PATCH 6/8] PM: Add suspend blocking work., Tejun Heo, (Wed Apr 28, 1:22 pm)
Re: [PATCH 1/8] PM: Add suspend block api., Rafael J. Wysocki, (Wed Apr 28, 1:50 pm)
Re: [PATCH 2/8] PM: suspend_block: Add driver to access su ..., Rafael J. Wysocki, (Wed Apr 28, 1:58 pm)
Re: [PATCH 6/8] PM: Add suspend blocking work., Rafael J. Wysocki, (Wed Apr 28, 2:08 pm)
Re: [PATCH 6/8] PM: Add suspend blocking work., Rafael J. Wysocki, (Wed Apr 28, 2:09 pm)
Re: [PATCH 6/8] PM: Add suspend blocking work., Arve Hjønnevåg, (Wed Apr 28, 3:09 pm)
Re: [PATCH 6/8] PM: Add suspend blocking work., Rafael J. Wysocki, (Wed Apr 28, 3:19 pm)
Re: [PATCH 2/8] PM: suspend_block: Add driver to access su ..., Rafael J. Wysocki, (Wed Apr 28, 4:05 pm)
Re: [PATCH 1/8] PM: Add suspend block api., Arve Hjønnevåg, (Wed Apr 28, 8:37 pm)
Re: [PATCH 6/8] PM: Add suspend blocking work., Arve Hjønnevåg, (Wed Apr 28, 8:47 pm)
Re: [PATCH 6/8] PM: Add suspend blocking work., Oleg Nesterov, (Thu Apr 29, 11:58 am)
[PATCH 1/2] workqueues: flush_delayed_work: keep the origi ..., Oleg Nesterov, (Thu Apr 29, 12:45 pm)
[PATCH 2/2] workqueues: export keventd_wq, Oleg Nesterov, (Thu Apr 29, 12:45 pm)
Re: [PATCH 6/8] PM: Add suspend blocking work., Rafael J. Wysocki, (Thu Apr 29, 2:08 pm)
Re: [PATCH 6/8] PM: Add suspend blocking work., Rafael J. Wysocki, (Thu Apr 29, 2:09 pm)
Re: [PATCH 2/8] PM: suspend_block: Add driver to access su ..., Rafael J. Wysocki, (Thu Apr 29, 2:11 pm)
Re: [PATCH 1/8] PM: Add suspend block api., Rafael J. Wysocki, (Thu Apr 29, 2:16 pm)
Re: [PATCH 1/8] PM: Add suspend block api., Tejun Heo, (Thu Apr 29, 9:24 pm)
Re: [PATCH 2/2] workqueues: export keventd_wq, Tejun Heo, (Thu Apr 29, 10:16 pm)
Re: [PATCH 2/2] workqueues: export keventd_wq, Arve Hjønnevåg, (Thu Apr 29, 10:39 pm)
Re: [PATCH 2/2] workqueues: export keventd_wq, Tejun Heo, (Thu Apr 29, 10:52 pm)
Re: [PATCH 1/8] PM: Add suspend block api., Oleg Nesterov, (Fri Apr 30, 10:26 am)
Re: [PATCH 2/2] workqueues: export keventd_wq, Oleg Nesterov, (Fri Apr 30, 11:05 am)
Re: [PATCH 2/2] workqueues: export keventd_wq, Tejun Heo, (Fri Apr 30, 11:11 am)
Re: [PATCH 1/8] PM: Add suspend block api., Tejun Heo, (Thu May 20, 1:30 am)
Re: [PATCH 1/8] PM: Add suspend block api., Rafael J. Wysocki, (Thu May 20, 3:27 pm)
Re: [PATCH 1/8] PM: Add suspend block api., Tejun Heo, (Thu May 20, 11:35 pm)