From: Oleg Nesterov <oleg@redhat.com>
To: "Rafael J. Wysocki" <rjw@sisk.pl>, Tejun Heo <tj@kernel.org>
Cc: "Arve Hjønnevåg" <arve@android.com>,
linux-pm@lists.linux-foundation.org,
linux-kernel@vger.kernel.org,
"Alan Stern" <stern@rowland.harvard.edu>,
"Pavel Machek" <pavel@ucw.cz>, "Len Brown" <len.brown@intel.com>
Subject: [PATCH 1/2] workqueues: flush_delayed_work: keep the original workqueue for re-queueing
Date: Thu, 29 Apr 2010 21:45:16 +0200 [thread overview]
Message-ID: <20100429194516.GB17280@redhat.com> (raw)
In-Reply-To: <20100429194447.GA17280@redhat.com>
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();
}
next prev parent reply other threads:[~2010-04-30 16:55 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-28 4:31 [PATCH 0/9] Suspend block api (version 5) Arve Hjønnevåg
2010-04-28 4:31 ` [PATCH 1/8] PM: Add suspend block api Arve Hjønnevåg
2010-04-28 4:31 ` [PATCH 2/8] PM: suspend_block: Add driver to access suspend blockers from user-space Arve Hjønnevåg
2010-04-28 4:31 ` [PATCH 3/8] PM: suspend_block: Abort task freezing if a suspend_blocker is active Arve Hjønnevåg
2010-04-28 4:31 ` [PATCH 4/8] PM: suspend_block: Add debugfs file Arve Hjønnevåg
2010-04-28 4:31 ` [PATCH 5/8] PM: suspend_block: Add suspend_blocker stats Arve Hjønnevåg
2010-04-28 4:31 ` [PATCH 6/8] PM: Add suspend blocking work Arve Hjønnevåg
2010-04-28 4:31 ` [PATCH 7/8] Input: Block suspend while event queue is not empty Arve Hjønnevåg
2010-04-28 4:31 ` [PATCH 8/8] power_supply: Block suspend while power supply change notifications are pending Arve Hjønnevåg
2010-04-28 6:06 ` [PATCH 6/8] PM: Add suspend blocking work Pavel Machek
2010-04-28 6:44 ` Tejun Heo
2010-04-28 7:02 ` Arve Hjønnevåg
2010-04-28 7:18 ` Tejun Heo
2010-04-28 19:40 ` Oleg Nesterov
2010-04-28 20:22 ` Tejun Heo
2010-04-28 21:08 ` Rafael J. Wysocki
2010-04-29 18:58 ` Oleg Nesterov
2010-04-29 19:44 ` [PATCH 0/2] workqueue fixlets (Was: PM: Add suspend blocking work.) Oleg Nesterov
2010-04-29 19:45 ` Oleg Nesterov [this message]
2010-04-30 5:15 ` [PATCH 1/2] workqueues: flush_delayed_work: keep the original workqueue for re-queueing Tejun Heo
2010-04-29 19:45 ` [PATCH 2/2] workqueues: export keventd_wq Oleg Nesterov
2010-04-30 5:16 ` Tejun Heo
2010-04-30 5:39 ` Arve Hjønnevåg
2010-04-30 5:52 ` Tejun Heo
2010-04-30 18:05 ` Oleg Nesterov
2010-04-30 18:11 ` Tejun Heo
2010-04-29 21:08 ` [PATCH 6/8] PM: Add suspend blocking work Rafael J. Wysocki
2010-04-28 21:09 ` Rafael J. Wysocki
2010-04-28 22:09 ` Arve Hjønnevåg
2010-04-28 22:19 ` Rafael J. Wysocki
2010-04-29 3:47 ` Arve Hjønnevåg
2010-04-29 21:09 ` Rafael J. Wysocki
2010-04-28 5:07 ` [PATCH 3/8] PM: suspend_block: Abort task freezing if a suspend_blocker is active Pavel Machek
2010-04-28 20:58 ` [PATCH 2/8] PM: suspend_block: Add driver to access suspend blockers from user-space Rafael J. Wysocki
2010-04-28 22:31 ` Arve Hjønnevåg
2010-04-28 23:05 ` Rafael J. Wysocki
2010-04-28 23:38 ` Arve Hjønnevåg
2010-04-29 21:11 ` Rafael J. Wysocki
2010-04-29 23:41 ` Arve Hjønnevåg
2010-04-28 6:07 ` [PATCH 1/8] PM: Add suspend block api Pavel Machek
2010-04-28 19:13 ` Alan Stern
2010-04-28 21:13 ` Rafael J. Wysocki
2010-04-28 23:35 ` Arve Hjønnevåg
2010-04-29 15:41 ` Alan Stern
2010-04-29 23:39 ` Arve Hjønnevåg
2010-04-30 14:41 ` Alan Stern
2010-04-28 20:50 ` Rafael J. Wysocki
2010-04-29 3:37 ` Arve Hjønnevåg
2010-04-29 21:16 ` Rafael J. Wysocki
2010-04-30 4:24 ` Tejun Heo
2010-04-30 17:26 ` Oleg Nesterov
2010-05-20 8:30 ` Tejun Heo
2010-05-20 22:27 ` Rafael J. Wysocki
2010-05-21 6:35 ` Tejun Heo
2010-05-06 15:18 ` Alan Stern
2010-05-06 19:28 ` Rafael J. Wysocki
2010-05-06 19:40 ` Alan Stern
2010-05-06 23:48 ` Arve Hjønnevåg
2010-05-07 14:22 ` Alan Stern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100429194516.GB17280@redhat.com \
--to=oleg@redhat.com \
--cc=arve@android.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=pavel@ucw.cz \
--cc=rjw@sisk.pl \
--cc=stern@rowland.harvard.edu \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).