Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1634c48f authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

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: default avatarOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a848e3b6

include/linux/workqueue.h

+10 −3
Original line number Diff line number Diff line
@@ -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

kernel/workqueue.c

+9 −18
Original line number Diff line number Diff line
@@ -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)

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);

	}

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);