* [PATCH] revert "cancel_delayed_work: use del_timer() instead of del_timer_sync()"
@ 2007-05-17 19:25 Oleg Nesterov
0 siblings, 0 replies; only message in thread
From: Oleg Nesterov @ 2007-05-17 19:25 UTC (permalink / raw)
To: Andrew Morton; +Cc: Jarek Poplawski, David Howells, linux-kernel
As pointed out by Jarek Poplawski, the patch
[WORKQUEUE]: cancel_delayed_work: use del_timer() instead of del_timer_sync()
commit: 071b638689464c6b39407025eedd810d5b5e6f5d
was wrong, it was merged by mistake after that.
>From the changelog:
after this patch:
...
delayed_work_timer_fn->__queue_work() in progress.
The latter doesn't differ from the caller's POV,
it does make a difference if the caller calls flush_workqueue() after
cancel_delayed_work(), in that case flush_workqueue() can miss this
work_struct.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
--- t/include/linux/workqueue.h~ 2007-05-17 22:55:59.000000000 +0400
+++ t/include/linux/workqueue.h 2007-05-17 23:03:03.000000000 +0400
@@ -160,7 +160,7 @@ static inline int cancel_delayed_work(st
{
int ret;
- ret = del_timer(&work->timer);
+ ret = del_timer_sync(&work->timer);
if (ret)
work_clear_pending(&work->work);
return ret;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-05-17 19:25 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-05-17 19:25 [PATCH] revert "cancel_delayed_work: use del_timer() instead of del_timer_sync()" Oleg Nesterov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome