block: don't delay blk_run_queue_async
authorShaohua Li <shaohua.li@intel.com>
Wed, 18 May 2011 09:22:43 +0000 (11:22 +0200)
committerJens Axboe <jaxboe@fusionio.com>
Wed, 18 May 2011 10:24:03 +0000 (12:24 +0200)
commit3ec717b7ca4ee1d75d77e4f6286430d8f01d1dbd
treefcf1db152baea6270dd6c4dbdf6ff8dd15ad440f
parent9937a5e2f32892db0dbeefc2b3bc74b3ae3ea9c7
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>
block/blk-core.c