summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2016-02-11 13:05:38 -0700
committerJens Axboe <axboe@fb.com>2016-02-11 13:14:00 -0700
commita59e0f5795fe52dad42a99c00287e3766153b312 (patch)
tree0fbb8fabb6b467701a53a33c71121aaceb564073 /block
parent5f009d3f8e6685fe8c6215082c1696a08b411220 (diff)
downloadlinux-a59e0f5795fe52dad42a99c00287e3766153b312.tar.gz
linux-a59e0f5795fe52dad42a99c00287e3766153b312.tar.bz2
linux-a59e0f5795fe52dad42a99c00287e3766153b312.zip
blk-mq: End unstarted requests on dying queue
Go directly to ending a request if it wasn't started. Previously, completing a request may invoke a driver callback for a request it didn't initialize. Signed-off-by: Keith Busch <keith.busch@intel.com> Reviewed-by: Sagi Grimberg <sagig@mellanox.com> Reviewed-by: Johannes Thumshirn <jthumshirn at suse.de> Acked-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-mq.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 4c0622fae413..56c0a726b619 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -599,8 +599,10 @@ static void blk_mq_check_expired(struct blk_mq_hw_ctx *hctx,
* If a request wasn't started before the queue was
* marked dying, kill it here or it'll go unnoticed.
*/
- if (unlikely(blk_queue_dying(rq->q)))
- blk_mq_complete_request(rq, -EIO);
+ if (unlikely(blk_queue_dying(rq->q))) {
+ rq->errors = -EIO;
+ blk_mq_end_request(rq, rq->errors);
+ }
return;
}