diff options
| author | Tejun Heo <tj@kernel.org> | 2011-04-05 18:01:44 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-20 13:54:46 +0200 |
| commit | 9c5a2ba70251ecaab18c7a83e38b3c620223476c (patch) | |
| tree | ece2c035b761af1332ea027f32443a6d05b16bc9 /include/linux | |
| parent | 2543a87108d2af7d48a43b3d6685c2b1ea279e36 (diff) | |
| download | op-kernel-dev-9c5a2ba70251ecaab18c7a83e38b3c620223476c.zip op-kernel-dev-9c5a2ba70251ecaab18c7a83e38b3c620223476c.tar.gz | |
workqueue: separate out drain_workqueue() from destroy_workqueue()
There are users which want to drain workqueues without destroying it.
Separate out drain functionality from destroy_workqueue() into
drain_workqueue() and make it accessible to workqueue users.
To guarantee forward-progress, only chain queueing is allowed while
drain is in progress. If a new work item which isn't chained from the
running or pending work items is queued while draining is in progress,
WARN_ON_ONCE() is triggered.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: James Bottomley <James.Bottomley@hansenpartnership.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/workqueue.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 57b31b3..2be2887 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -255,7 +255,7 @@ enum { WQ_HIGHPRI = 1 << 4, /* high priority */ WQ_CPU_INTENSIVE = 1 << 5, /* cpu instensive workqueue */ - WQ_DYING = 1 << 6, /* internal: workqueue is dying */ + WQ_DRAINING = 1 << 6, /* internal: workqueue is draining */ WQ_RESCUER = 1 << 7, /* internal: workqueue has rescuer */ WQ_MAX_ACTIVE = 512, /* I like 512, better ideas? */ @@ -355,6 +355,7 @@ extern int queue_delayed_work_on(int cpu, struct workqueue_struct *wq, struct delayed_work *work, unsigned long delay); extern void flush_workqueue(struct workqueue_struct *wq); +extern void drain_workqueue(struct workqueue_struct *wq); extern void flush_scheduled_work(void); extern int schedule_work(struct work_struct *work); |
