workqueue: fix zero @delay handling of queue_delayed_work_on() (715f1300) · Commits · 戴 / test

kernel/workqueue.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -1125,7 +1125,9 @@ EXPORT_SYMBOL_GPL(delayed_work_timer_fn);
		* @dwork: work to queue
		* @delay: number of jiffies to wait before queueing
		*
		* Returns %false if @work was already on a queue, %true otherwise.
		* Returns %false if @work was already on a queue, %true otherwise. If
		* @delay is zero and @dwork is idle, it will be scheduled for immediate
		* execution.
		*/
		bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
		struct delayed_work *dwork, unsigned long delay)
		@@ -1135,6 +1137,9 @@ bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
		bool ret = false;
		unsigned long flags;

		if (!delay)
		return queue_work_on(cpu, wq, &dwork->work);

		/* read the comment in __queue_work() */
		local_irq_save(flags);

		@@ -1185,14 +1190,11 @@ EXPORT_SYMBOL_GPL(queue_delayed_work_on);
		* @dwork: delayable work to queue
		* @delay: number of jiffies to wait before queueing
		*
		* Returns %false if @work was already on a queue, %true otherwise.
		* Equivalent to queue_delayed_work_on() but tries to use the local CPU.
		*/
		bool queue_delayed_work(struct workqueue_struct *wq,
		struct delayed_work *dwork, unsigned long delay)
		{
		if (delay == 0)
		return queue_work(wq, &dwork->work);

		return queue_delayed_work_on(WORK_CPU_UNBOUND, wq, dwork, delay);
		}
		EXPORT_SYMBOL_GPL(queue_delayed_work);