From: Tejun Heo <tj@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org,
Dan Magenheimer <dan.magenheimer@oracle.com>
Subject: [GIT PULL] workqueue fixes for v3.7-rc2
Date: Wed, 24 Oct 2012 12:46:05 -0700 [thread overview]
Message-ID: <20121024194605.GH12182@atj.dyndns.org> (raw)
Hello, Linus.
This pull request contains one patch from Dan Magenheimer to fix
cancel_delayed_work() regression introduced by its reimplementation
using try_to_grab_pending(). The reimplementation made it incorrectly
return %true when the work item is idle. There aren't too many
consumers of the return value but it broke at least ramster.
Please pull from the following branch to receive the fix.
git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git for-3.7-fixes
workqueue: cancel_delayed_work() should return %false if work item is idle (2012-10-24 12:38:16 -0700)
----------------------------------------------------------------
Dan Magenheimer (1):
workqueue: cancel_delayed_work() should return %false if work item is idle
kernel/workqueue.c | 2 +-
1 file changed, 1 insertion(+), 1
---
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index d951daa..042d221 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -2982,7 +2982,7 @@ bool cancel_delayed_work(struct delayed_work *dwork)
set_work_cpu_and_clear_pending(&dwork->work, work_cpu(&dwork->work));
local_irq_restore(flags);
- return true;
+ return ret;
}
EXPORT_SYMBOL(cancel_delayed_work);
reply other threads:[~2012-10-24 19:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20121024194605.GH12182@atj.dyndns.org \
--to=tj@kernel.org \
--cc=dan.magenheimer@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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).