aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Van Assche2012-12-06 07:32:01 -0600
committerJens Axboe2012-12-06 07:32:01 -0600
commitc246e80d86736312933646896c4157daf511dadc (patch)
tree183119080e120f5a3e98edf5bb824e940e5b8f18 /block/blk-exec.c
parent807592a4fafba1fea6e98b9cf1fb02b7c38fb24c (diff)
downloadkernel-common-c246e80d86736312933646896c4157daf511dadc.tar.gz
kernel-common-c246e80d86736312933646896c4157daf511dadc.tar.xz
kernel-common-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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-exec.c b/block/blk-exec.c
index 4aec98df7ba..1320e74d79b 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,
72 __blk_run_queue(q); 72 __blk_run_queue(q);
73 /* the queue is stopped so it won't be run */ 73 /* the queue is stopped so it won't be run */
74 if (rq->cmd_type == REQ_TYPE_PM_RESUME) 74 if (rq->cmd_type == REQ_TYPE_PM_RESUME)
75 q->request_fn(q); 75 __blk_run_queue_uncond(q);
76 spin_unlock_irq(q->queue_lock); 76 spin_unlock_irq(q->queue_lock);
77} 77}
78EXPORT_SYMBOL_GPL(blk_execute_rq_nowait); 78EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);