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

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

rename cancel_rearming_delayed_work() to cancel_delayed_work_sync() 



Imho, the current naming of cancel_xxx workqueue functions is very confusing.

	cancel_delayed_work()
	cancel_rearming_delayed_work()
	cancel_rearming_delayed_workqueue()	// obsolete

	cancel_work_sync()

This looks as if the first 2 functions differ in "type" of their argument
which is not true any longer, nowadays the difference is the behaviour.

The semantics of cancel_rearming_delayed_work(dwork) was changed
significantly, it doesn't require that dwork rearms itself, and cancels dwork
synchronously.

Rename it to cancel_delayed_work_sync().  This matches cancel_delayed_work()
and cancel_work_sync().  Re-create cancel_rearming_delayed_work() as a simple
inline obsolete wrapper, like cancel_rearming_delayed_workqueue().

Signed-off-by: default avatarOleg Nesterov <oleg@tv-sign.ru>
Acked-by: default avatarJarek Poplawski <jarkao2@o2.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 422b14c2

include/linux/workqueue.h

+10 −3
Original line number Original line Diff line number Diff line
@@ -166,14 +166,21 @@ static inline int cancel_delayed_work(struct delayed_work *work) 
	return ret;

	return ret;

}

}





extern void cancel_rearming_delayed_work(struct delayed_work *work);

extern void cancel_delayed_work_sync(struct delayed_work *work);





/* Obsolete. use cancel_rearming_delayed_work() */

/* Obsolete. use cancel_delayed_work_sync() */

static inline

static inline

void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq,

void cancel_rearming_delayed_workqueue(struct workqueue_struct *wq,

					struct delayed_work *work)

					struct delayed_work *work)

{

{

	cancel_rearming_delayed_work(work);

	cancel_delayed_work_sync(work);

}



/* Obsolete. use cancel_delayed_work_sync() */

static inline

void cancel_rearming_delayed_work(struct delayed_work *work)

{

	cancel_delayed_work_sync(work);

}

}





#endif
 
#endif

kernel/workqueue.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -486,13 +486,13 @@ void cancel_work_sync(struct work_struct *work) 
EXPORT_SYMBOL_GPL(cancel_work_sync);

EXPORT_SYMBOL_GPL(cancel_work_sync);





/**

/**

 * cancel_rearming_delayed_work - reliably kill off a delayed work.

 * cancel_delayed_work_sync - reliably kill off a delayed work.

 * @dwork: the delayed work struct

 * @dwork: the delayed work struct

 *

 *

 * It is possible to use this function if @dwork rearms itself via queue_work()

 * It is possible to use this function if @dwork rearms itself via queue_work()

 * or queue_delayed_work(). See also the comment for cancel_work_sync().

 * or queue_delayed_work(). See also the comment for cancel_work_sync().

 */

 */

void cancel_rearming_delayed_work(struct delayed_work *dwork)

void cancel_delayed_work_sync(struct delayed_work *dwork)

{

{

	while (!del_timer(&dwork->timer) &&

	while (!del_timer(&dwork->timer) &&

	       !try_to_grab_pending(&dwork->work))

	       !try_to_grab_pending(&dwork->work))
@@ -500,7 +500,7 @@ void cancel_rearming_delayed_work(struct delayed_work *dwork) 
	wait_on_work(&dwork->work);

	wait_on_work(&dwork->work);

	work_clear_pending(&dwork->work);

	work_clear_pending(&dwork->work);

}

}

EXPORT_SYMBOL(cancel_rearming_delayed_work);

EXPORT_SYMBOL(cancel_delayed_work_sync);





static struct workqueue_struct *keventd_wq __read_mostly;

static struct workqueue_struct *keventd_wq __read_mostly;