diff options
| author | Tejun Heo <tj@kernel.org> | 2012-08-21 22:18:24 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2012-08-21 22:18:24 +0200 |
| commit | e7c2f967445dd2041f0f8e3179cca22bb8bb7f79 (patch) | |
| tree | cb6c1d3593d2497e740d313f55592f41e8ae2039 /block/blk-core.c | |
| parent | workqueue: use irqsafe timer for delayed_work (diff) | |
| download | linux-e7c2f967445dd2041f0f8e3179cca22bb8bb7f79.tar.xz linux-e7c2f967445dd2041f0f8e3179cca22bb8bb7f79.zip | |
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: Tejun Heo <tj@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 4b4dbdfbca89..4b8b606dbb01 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -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); |