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 <[EMAIL PROTECTED]>

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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to