Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7c2f967 authored by Tejun Heo's avatar Tejun Heo
Browse files

workqueue: use mod_delayed_work() instead of __cancel + queue 



Now that mod_delayed_work() is safe to call from IRQ handlers,
__cancel_delayed_work() followed by queue_delayed_work() can be
replaced with mod_delayed_work().

Most conversions are straight-forward except for the following.

* net/core/link_watch.c: linkwatch_schedule_work() was doing a quite
  elaborate dancing around its delayed_work.  Collapse it such that
  linkwatch_work is queued for immediate execution if LW_URGENT and
  existing timer is kept otherwise.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
parent e0aecdd8

block/blk-core.c

+2 −4
Original line number Diff line number Diff line
@@ -319,10 +319,8 @@ EXPORT_SYMBOL(__blk_run_queue); 
 */

void blk_run_queue_async(struct request_queue *q)

{

	if (likely(!blk_queue_stopped(q))) {

		__cancel_delayed_work(&q->delay_work);

		queue_delayed_work(kblockd_workqueue, &q->delay_work, 0);

	}

	if (likely(!blk_queue_stopped(q)))

		mod_delayed_work(kblockd_workqueue, &q->delay_work, 0);

}

EXPORT_SYMBOL(blk_run_queue_async);

block/blk-throttle.c

+1 −6
Original line number Diff line number Diff line
@@ -929,12 +929,7 @@ throtl_schedule_delayed_work(struct throtl_data *td, unsigned long delay) 


	/* schedule work if limits changed even if no bio is queued */

	if (total_nr_queued(td) || td->limits_changed) {

		/*

		 * We might have a work scheduled to be executed in future.

		 * Cancel that and schedule a new one.

		 */

		__cancel_delayed_work(dwork);

		queue_delayed_work(kthrotld_workqueue, dwork, delay);

		mod_delayed_work(kthrotld_workqueue, dwork, delay);

		throtl_log(td, "schedule work. delay=%lu jiffies=%lu",

				delay, jiffies);

	}

drivers/block/floppy.c

+1 −2
Original line number Diff line number Diff line
@@ -672,7 +672,6 @@ static void __reschedule_timeout(int drive, const char *message) 


	if (drive == current_reqD)

		drive = current_drive;

	__cancel_delayed_work(&fd_timeout);



	if (drive < 0 || drive >= N_DRIVE) {

		delay = 20UL * HZ;
@@ -680,7 +679,7 @@ static void __reschedule_timeout(int drive, const char *message) 
	} else

		delay = UDP->timeout;



	queue_delayed_work(floppy_wq, &fd_timeout, delay);

	mod_delayed_work(floppy_wq, &fd_timeout, delay);

	if (UDP->flags & FD_DEBUG)

		DPRINT("reschedule timeout %s\n", message);

	timeout_message = message;

drivers/infiniband/core/mad.c

+5 −9
Original line number Diff line number Diff line
@@ -2013,12 +2013,10 @@ static void adjust_timeout(struct ib_mad_agent_private *mad_agent_priv) 
		if (time_after(mad_agent_priv->timeout,

			       mad_send_wr->timeout)) {

			mad_agent_priv->timeout = mad_send_wr->timeout;

			__cancel_delayed_work(&mad_agent_priv->timed_work);

			delay = mad_send_wr->timeout - jiffies;

			if ((long)delay <= 0)

				delay = 1;

			queue_delayed_work(mad_agent_priv->qp_info->

					   port_priv->wq,

			mod_delayed_work(mad_agent_priv->qp_info->port_priv->wq,

					 &mad_agent_priv->timed_work, delay);

		}

	}
@@ -2052,12 +2050,10 @@ static void wait_for_response(struct ib_mad_send_wr_private *mad_send_wr) 
	list_add(&mad_send_wr->agent_list, list_item);



	/* Reschedule a work item if we have a shorter timeout */

	if (mad_agent_priv->wait_list.next == &mad_send_wr->agent_list) {

		__cancel_delayed_work(&mad_agent_priv->timed_work);

		queue_delayed_work(mad_agent_priv->qp_info->port_priv->wq,

	if (mad_agent_priv->wait_list.next == &mad_send_wr->agent_list)

		mod_delayed_work(mad_agent_priv->qp_info->port_priv->wq,

				 &mad_agent_priv->timed_work, delay);

}

}



void ib_reset_mad_timeout(struct ib_mad_send_wr_private *mad_send_wr,

			  int timeout_ms)

drivers/input/keyboard/qt2160.c

+1 −2
Original line number Diff line number Diff line
@@ -156,8 +156,7 @@ static irqreturn_t qt2160_irq(int irq, void *_qt2160) 


	spin_lock_irqsave(&qt2160->lock, flags);



	__cancel_delayed_work(&qt2160->dwork);

	schedule_delayed_work(&qt2160->dwork, 0);

	mod_delayed_work(system_wq, &qt2160->dwork, 0);



	spin_unlock_irqrestore(&qt2160->lock, flags);