diff options
| author | James Bottomley | 2005-04-17 00:23:59 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-04-17 00:23:59 +0200 |
| commit | 81ddef77bb774e771db8588b937665cd38f40cee (patch) | |
| tree | 5e89b0f6bb47a43b3b00d30a5e1e22db727b5047 | |
| parent | [PATCH] crypto: call zlib end functions on deflate exit path (diff) | |
| download | kernel-qcow2-linux-81ddef77bb774e771db8588b937665cd38f40cee.tar.gz kernel-qcow2-linux-81ddef77bb774e771db8588b937665cd38f40cee.tar.xz kernel-qcow2-linux-81ddef77bb774e771db8588b937665cd38f40cee.zip | |
[PATCH] re-export cancel_rearming_delayed_workqueue
This was unexported by Arjan because we have no current users.
However, during a conversion from tasklets to workqueues of the parisc led
functions, we ran across a case where this was needed. In particular, the
open coded equivalent of cancel_rearming_delayed_workqueue was implemented
incorrectly, which is, I think, all the evidence necessary that this is a
useful API.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/linux/workqueue.h | 2 | ||||
| -rw-r--r-- | kernel/workqueue.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index ff46f537ba9b..ac39d04d027c 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -71,6 +71,8 @@ extern int keventd_up(void); extern void init_workqueues(void); void cancel_rearming_delayed_work(struct work_struct *work); +void cancel_rearming_delayed_workqueue(struct workqueue_struct *, + struct work_struct *); /* * Kill off a pending schedule_delayed_work(). Note that the work callback diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 52ef419d2747..259cf55da3c9 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -429,12 +429,13 @@ void flush_scheduled_work(void) * @wq: the controlling workqueue structure * @work: the delayed work struct */ -static void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq, - struct work_struct *work) +void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq, + struct work_struct *work) { while (!cancel_delayed_work(work)) flush_workqueue(wq); } +EXPORT_SYMBOL(cancel_rearming_delayed_workqueue); /** * cancel_rearming_delayed_work - reliably kill off a delayed keventd |