diff options
| author | Bart Van Assche <bart.vanassche@sandisk.com> | 2016-10-29 03:18:48 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-11-02 21:50:19 +0300 |
| commit | bc27c01b5c46d3bfec42c96537c7a3fae0bb2cc4 (patch) | |
| tree | a0ae0f958956c65285b906e911f6b0f7df69fc0b | |
| parent | 2cefe4dbaadf83b236caab46705b4b5a4958e3b6 (diff) | |
| download | linux-bc27c01b5c46d3bfec42c96537c7a3fae0bb2cc4.tar.xz | |
blk-mq: Do not invoke .queue_rq() for a stopped queue
The meaning of the BLK_MQ_S_STOPPED flag is "do not call
.queue_rq()". Hence modify blk_mq_make_request() such that requests
are queued instead of issued if a queue has been stopped.
Reported-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ming Lei <tom.leiming@gmail.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Cc: <stable@vger.kernel.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | block/blk-mq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 2da1a0ee3318..92edd28b7e76 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1317,9 +1317,9 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) blk_mq_put_ctx(data.ctx); if (!old_rq) goto done; - if (!blk_mq_direct_issue_request(old_rq, &cookie)) - goto done; - blk_mq_insert_request(old_rq, false, true, true); + if (test_bit(BLK_MQ_S_STOPPED, &data.hctx->state) || + blk_mq_direct_issue_request(old_rq, &cookie) != 0) + blk_mq_insert_request(old_rq, false, true, true); goto done; } |