summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-08-03 10:30:47 -0700
committerTejun Heo <tj@kernel.org>2012-08-03 10:30:47 -0700
commit8376fe22c7e79c7e90857d39f82aeae6cad6c4b8 (patch)
tree3a77fda11324a25abfe1ffe3ea0eba28a4fac03f /include/linux
parentbbb68dfaba73e8338fe0f1dc711cc1d261daec87 (diff)
downloadlinux-stable-8376fe22c7e79c7e90857d39f82aeae6cad6c4b8.tar.gz
linux-stable-8376fe22c7e79c7e90857d39f82aeae6cad6c4b8.tar.bz2
linux-stable-8376fe22c7e79c7e90857d39f82aeae6cad6c4b8.zip
workqueue: implement mod_delayed_work[_on]()
Workqueue was lacking a mechanism to modify the timeout of an already pending delayed_work. delayed_work users have been working around this using several methods - using an explicit timer + work item, messing directly with delayed_work->timer, and canceling before re-queueing, all of which are error-prone and/or ugly. This patch implements mod_delayed_work[_on]() which behaves similarly to mod_timer() - if the delayed_work is idle, it's queued with the given delay; otherwise, its timeout is modified to the new value. Zero @delay guarantees immediate execution. v2: Updated to reflect try_to_grab_pending() changes. Now safe to be called from bh context. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/workqueue.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index 5f4aeaa9f3e6..20000305a8a6 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -390,6 +390,10 @@ extern bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
struct delayed_work *work, unsigned long delay);
extern bool queue_delayed_work(struct workqueue_struct *wq,
struct delayed_work *work, unsigned long delay);
+extern bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq,
+ struct delayed_work *dwork, unsigned long delay);
+extern bool mod_delayed_work(struct workqueue_struct *wq,
+ struct delayed_work *dwork, unsigned long delay);
extern void flush_workqueue(struct workqueue_struct *wq);
extern void drain_workqueue(struct workqueue_struct *wq);