Commit d579a35d authored Oct 24, 2012 by Linus Torvalds

Merge branch 'for-3.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

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

parents 0e9e3e30 c0158ca6

kernel/workqueue.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2982,7 +2982,7 @@ bool cancel_delayed_work(struct delayed_work *dwork)

		set_work_cpu_and_clear_pending(&dwork->work, work_cpu(&dwork->work));
		local_irq_restore(flags);
		return true;
		return ret;
		}
		EXPORT_SYMBOL(cancel_delayed_work);

Admin message