diff options
| author | Oleg Nesterov <oleg@tv-sign.ru> | 2007-05-18 00:36:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-18 08:17:17 -0700 |
| commit | 223a10a98135da38d3668973d72cdffb1ced4b7d (patch) | |
| tree | b3ea5357ba2c9e9e201dbd1c62b215d87bfdf92a | |
| parent | b46522394dde7341a5253658096f354b65cbd90d (diff) | |
| download | linux-223a10a98135da38d3668973d72cdffb1ced4b7d.tar.bz2 | |
revert "cancel_delayed_work: use del_timer() instead of del_timer_sync()"
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>
Cc: Jarek Poplawski <jarkao2@o2.pl>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | include/linux/workqueue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h index 7eae8665ff59..ce0719a2cfeb 100644 --- a/include/linux/workqueue.h +++ b/include/linux/workqueue.h @@ -160,7 +160,7 @@ static inline int cancel_delayed_work(struct delayed_work *work) { int ret; - ret = del_timer(&work->timer); + ret = del_timer_sync(&work->timer); if (ret) work_clear_pending(&work->work); return ret; |