From: James Bottomley Date: Sat, 16 Apr 2005 22:23:59 +0000 (-0700) Subject: [PATCH] re-export cancel_rearming_delayed_workqueue X-Git-Tag: v2.6.12-rc3~237 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=81ddef77bb774e771db8588b937665cd38f40cee;p=~emulex%2Finfiniband.git [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index ff46f537ba9..ac39d04d027 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 52ef419d274..259cf55da3c 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