dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

make cancel_rearming_delayed_work() work on any workqueue, not just keventd_wq 

cancel_rearming_delayed_workqueue(wq, dwork) doesn't need the first
parameter.  We don't hang on un-queued dwork any longer, and work->data
doesn't change its type.  This means we can always figure out "wq" from
dwork when it is needed.

Remove this parameter, and rename the function to
cancel_rearming_delayed_work().  Re-create an inline "obsolete"
cancel_rearming_delayed_workqueue(wq) which just calls
cancel_rearming_delayed_work().

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Oleg Nesterov 2007-05-09 02:34:18 -07:00 committed by Linus Torvalds
parent a848e3b67c
commit 1634c48f8b
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/linux/workqueue.h
View File

@ -191,9 +191,6 @@ extern int current_is_keventd(void);
extern int keventd_up(void);
extern void init_workqueues(void);
void cancel_rearming_delayed_work(struct delayed_work *work);
void cancel_rearming_delayed_workqueue(struct workqueue_struct *,
struct delayed_work *);
int execute_in_process_context(work_func_t fn, struct execute_work *);
/*
@ -212,4 +209,14 @@ static inline int cancel_delayed_work(struct delayed_work *work)
return ret;
}
extern void cancel_rearming_delayed_work(struct delayed_work *work);
/* Obsolete. use cancel_rearming_delayed_work() */
static inline
void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq,
struct delayed_work *work)
{
cancel_rearming_delayed_work(work);
}
#endif

29
kernel/workqueue.c
View File

@ -555,32 +555,23 @@ void flush_work_keventd(struct work_struct *work)
EXPORT_SYMBOL(flush_work_keventd);
/**
* cancel_rearming_delayed_workqueue - kill off a delayed work whose handler rearms the delayed work.
* @wq: the controlling workqueue structure
* cancel_rearming_delayed_work - kill off a delayed work whose handler rearms the delayed work.
* @dwork: the delayed work struct
*
* Note that the work callback function may still be running on return from
* cancel_delayed_work(). Run flush_workqueue() or flush_work() to wait on it.
*/
void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq,
struct delayed_work *dwork)
{
/* Was it ever queued ? */
if (!get_wq_data(&dwork->work))
return;
while (!cancel_delayed_work(dwork))
flush_workqueue(wq);
}
EXPORT_SYMBOL(cancel_rearming_delayed_workqueue);
/**
* cancel_rearming_delayed_work - kill off a delayed keventd work whose handler rearms the delayed work.
* @dwork: the delayed work struct
*/
void cancel_rearming_delayed_work(struct delayed_work *dwork)
{
cancel_rearming_delayed_workqueue(keventd_wq, dwork);
struct cpu_workqueue_struct *cwq = get_wq_data(&dwork->work);
/* Was it ever queued ? */
if (cwq != NULL) {
struct workqueue_struct *wq = cwq->wq;
while (!cancel_delayed_work(dwork))
flush_workqueue(wq);
}
}
EXPORT_SYMBOL(cancel_rearming_delayed_work);