diff options
| author | Bart Van Assche <bvanassche@acm.org> | 2012-12-06 14:32:01 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-12-06 14:32:01 +0100 |
| commit | c246e80d86736312933646896c4157daf511dadc (patch) | |
| tree | 183119080e120f5a3e98edf5bb824e940e5b8f18 /block/blk-exec.c | |
| parent | 807592a4fafba1fea6e98b9cf1fb02b7c38fb24c (diff) | |
| download | linux-stable-c246e80d86736312933646896c4157daf511dadc.tar.gz linux-stable-c246e80d86736312933646896c4157daf511dadc.tar.bz2 linux-stable-c246e80d86736312933646896c4157daf511dadc.zip | |
block: Avoid that request_fn is invoked on a dead queue
A block driver may start cleaning up resources needed by its
request_fn as soon as blk_cleanup_queue() finished, so request_fn
must not be invoked after draining finished. This is important
when blk_run_queue() is invoked without any requests in progress.
As an example, if blk_drain_queue() and scsi_run_queue() run in
parallel, blk_drain_queue() may have finished all requests after
scsi_run_queue() has taken a SCSI device off the starved list but
before that last function has had a chance to run the queue.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Cc: James Bottomley <JBottomley@Parallels.com>
Cc: Mike Christie <michaelc@cs.wisc.edu>
Cc: Chanho Min <chanho.min@lge.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-exec.c')
| -rw-r--r-- | block/blk-exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-exec.c b/block/blk-exec.c index 4aec98df7ba5..1320e74d79b8 100644 --- a/block/blk-exec.c +++ b/block/blk-exec.c @@ -72,7 +72,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, __blk_run_queue(q); /* the queue is stopped so it won't be run */ if (rq->cmd_type == REQ_TYPE_PM_RESUME) - q->request_fn(q); + __blk_run_queue_uncond(q); spin_unlock_irq(q->queue_lock); } EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); |