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().
include/linux/workqueue.h | 13 ++++++++++--- kernel/workqueue.c | 26 +++++++++----------------- 2 files changed, 19 insertions(+), 20 deletions(-)
include/linux/workqueue.h renamed from include/linux/workqueue.h~4_crdw +10 -3
@@ -185,9 +185,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 *);/*
@@ -205,4 +202,14 @@ static inline int cancel_delayed_work(st return ret; } +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
kernel/workqueue.c renamed from kernel/workqueue.c~4_crdw +9 -17
@@ -555,36 +555,28 @@ void flush_work_keventd(struct work_struEXPORT_SYMBOL (flush_work_keventd);/** -* cancel_rearming_delayed_workqueue - kill off a delayed work whose handler rearms the delayed work. +* cancel_rearming_delayed_work - kill off a delayed work whose handler rearms the delayed work. * @wq: the controlling workqueue structure * @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) +void cancel_rearming_delayed_work (struct delayed_work *dwork) { +struct cpu_workqueue_struct *cwq =get_wq_data (&dwork->work); +/* Was it ever queued ? */ -if (!get_wq_data (&dwork->work)) -return ; +if (cwq !=NULL ) { +struct workqueue_struct *wq = cwq->wq; -while (!cancel_delayed_work (dwork)) -flush_workqueue (wq); +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); -} -EXPORT_SYMBOL (cancel_rearming_delayed_work); - -/** * execute_in_process_context - reliably execute the routine with user context * @fn: the function to execute * @ew: guaranteed storage for the execute work structure (must
Quoted 2 lines · Oleg Nesterov
Remove this parameter, and rename the function to
cancel_rearming_delayed_work().
Damn! Forgot to rename EXPORT_SYMBOL() as well, otherwise unchanged.
[PATCH 4/3] 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().
include/linux/workqueue.h | 13 ++++++++++--- kernel/workqueue.c | 26 +++++++++----------------- 2 files changed, 19 insertions(+), 20 deletions(-)
include/linux/workqueue.h renamed from include/linux/workqueue.h~4_crdw +10 -3
@@ -185,9 +185,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 *);/*
@@ -205,4 +202,14 @@ static inline int cancel_delayed_work(st 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
kernel/workqueue.c renamed from kernel/workqueue.c~4_crdw +9 -18
@@ -555,32 +555,23 @@ void flush_work_keventd(struct work_struEXPORT_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) +void cancel_rearming_delayed_work (struct delayed_work *dwork) { -/* Was it ever queued ? */ -if (!get_wq_data (&dwork->work)) -return ; +struct cpu_workqueue_struct *cwq =get_wq_data (&dwork->work); -while (!cancel_delayed_work (dwork)) -flush_workqueue (wq); -} -EXPORT_SYMBOL (cancel_rearming_delayed_workqueue); +/* Was it ever queued ? */ +if (cwq !=NULL ) { +struct workqueue_struct *wq = cwq->wq; -/** -* 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); +while (!cancel_delayed_work (dwork)) +flush_workqueue (wq); + } }EXPORT_SYMBOL (cancel_rearming_delayed_work);