diff options
author | Christoph Hellwig <hch@lst.de> | 2014-09-13 19:40:09 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-09-22 14:00:07 -0400 |
commit | e2490073cd7c3d6f6ef6e029a208edd4d38efac4 (patch) | |
tree | 48465e67b335f6d696d698641365b4a4d1e89d32 /drivers/block/virtio_blk.c | |
parent | bf57229745f849e500ba69ff91e35bc8160a7373 (diff) |
blk-mq: call blk_mq_start_request from ->queue_rq
When we call blk_mq_start_request from the core blk-mq code before calling into
->queue_rq there is a racy window where the timeout handler can hit before we've
fully set up the driver specific part of the command.
Move the call to blk_mq_start_request into the driver so the driver can start
the request only once it is fully set up.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/virtio_blk.c')
-rw-r--r-- | drivers/block/virtio_blk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 13756e016797..83816bf6882f 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c | |||
@@ -205,6 +205,8 @@ static int virtio_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *req, | |||
205 | } | 205 | } |
206 | } | 206 | } |
207 | 207 | ||
208 | blk_mq_start_request(req); | ||
209 | |||
208 | num = blk_rq_map_sg(hctx->queue, vbr->req, vbr->sg); | 210 | num = blk_rq_map_sg(hctx->queue, vbr->req, vbr->sg); |
209 | if (num) { | 211 | if (num) { |
210 | if (rq_data_dir(vbr->req) == WRITE) | 212 | if (rq_data_dir(vbr->req) == WRITE) |