Pull workqueue fix from Tejun Heo: "This pull request contains one patch from Dan Magenheimer to fix cancel_delayed_work() regression introduced by its reimplementation using try_to_grab_pending(). The reimplementation made it incorrectly return %true when the work item is idle. There aren't too many consumers of the return value but it broke at least ramster." * 'for-3.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: workqueue: cancel_delayed_work() should return %false if work item is idle
Unified · Split
| @@ -2982,7 +2982,7 @@ bool cancel_delayed_work(struct delayed_work *dwork) · 2981 unmodified lines | ||
| 2982 | 2982 | |
| 2983 | 2983 | set_work_cpu_and_clear_pending(&dwork->work, work_cpu(&dwork->work)); |
| 2984 | 2984 | local_irq_restore(flags); |
| 2985 | − return true; | |
| 2985 | + return ret; | |
| 2986 | 2986 | } |
| 2987 | 2987 | EXPORT_SYMBOL(cancel_delayed_work); |
| 2988 | 2988 | |