Commit:     223a10a98135da38d3668973d72cdffb1ced4b7d
Parent:     b46522394dde7341a5253658096f354b65cbd90d
Author:     Oleg Nesterov <[EMAIL PROTECTED]>
AuthorDate: Fri May 18 00:36:42 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri May 18 08:17:17 2007 -0700

    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 
        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
    Signed-off-by: Oleg Nesterov <[EMAIL PROTECTED]>
    Cc: Jarek Poplawski <[EMAIL PROTECTED]>
    Cc: David Howells <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 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 7eae866..ce0719a 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -160,7 +160,7 @@ static inline int cancel_delayed_work(struct delayed_work 
        int ret;
-       ret = del_timer(&work->timer);
+       ret = del_timer_sync(&work->timer);
        if (ret)
        return ret;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to