summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-10-14 09:16:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-14 15:11:35 -0700
commit8c53e46314562fe814b0afef6cfcbd2f562b017c (patch)
treee9b68a33c470a91967c5930438e93beeb3126c50 /kernel
parentc8e33141911bf8fe87dc6c92793b9a59b2be0130 (diff)
downloadop-kernel-dev-8c53e46314562fe814b0afef6cfcbd2f562b017c.zip
op-kernel-dev-8c53e46314562fe814b0afef6cfcbd2f562b017c.tar.gz
workqueue: add 'flush_delayed_work()' to run and wait for delayed work
It basically turns a delayed work into an immediate work, and then waits for it to finish, thus allowing you to force (and wait for) an immediate flush of a delayed work. We'll want to use this in the tty layer to clean up tty_flush_to_ldisc(). Acked-by: Oleg Nesterov <oleg@redhat.com> [ Fixed to use 'del_timer_sync()' as noted by Oleg ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/workqueue.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index addfe2d..47cdd7e 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -640,6 +640,24 @@ int schedule_delayed_work(struct delayed_work *dwork,
EXPORT_SYMBOL(schedule_delayed_work);
/**
+ * flush_delayed_work - block until a dwork_struct's callback has terminated
+ * @dwork: the delayed work which is to be flushed
+ *
+ * Any timeout is cancelled, and any pending work is run immediately.
+ */
+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());
+ __queue_work(cwq, &dwork->work);
+ put_cpu();
+ }
+ flush_work(&dwork->work);
+}
+EXPORT_SYMBOL(flush_delayed_work);
+
+/**
* schedule_delayed_work_on - queue work in global workqueue on CPU after delay
* @cpu: cpu to use
* @dwork: job to be done
OpenPOWER on IntegriCloud