Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3ec717b7ca4ee1d75d77e4f6286430d8f01d1dbd

Authored by Shaohua Li
Committed by Jens Axboe
1 parent 9937a5e2f3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

block: don't delay blk_run_queue_async 

Let's check a scenario:
1. blk_delay_queue(q, SCSI_QUEUE_DELAY);
2. blk_run_queue_async();
the second one will became a noop, because q->delay_work already has
WORK_STRUCT_PENDING_BIT set, so the delayed work will still run after
SCSI_QUEUE_DELAY. But blk_run_queue_async actually hopes the delayed
work runs immediately.

Fix this by doing a cancel on potentially pending delayed work
before queuing an immediate run of the workqueue.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

... ... @@ -316,8 +316,10 @@
316 316 */
317 317 void blk_run_queue_async(struct request_queue *q)
318 318 {
319   - if (likely(!blk_queue_stopped(q)))
  319 + if (likely(!blk_queue_stopped(q))) {
  320 + __cancel_delayed_work(&q->delay_work);
320 321 queue_delayed_work(kblockd_workqueue, &q->delay_work, 0);
  322 + }
321 323 }
322 324 EXPORT_SYMBOL(blk_run_queue_async);
323 325