|
@@ -337,12 +337,14 @@ static struct request *blk_mq_get_request(struct request_queue *q,
|
|
struct elevator_queue *e = q->elevator;
|
|
struct elevator_queue *e = q->elevator;
|
|
struct request *rq;
|
|
struct request *rq;
|
|
unsigned int tag;
|
|
unsigned int tag;
|
|
- struct blk_mq_ctx *local_ctx = NULL;
|
|
|
|
|
|
+ bool put_ctx_on_error = false;
|
|
|
|
|
|
blk_queue_enter_live(q);
|
|
blk_queue_enter_live(q);
|
|
data->q = q;
|
|
data->q = q;
|
|
- if (likely(!data->ctx))
|
|
|
|
- data->ctx = local_ctx = blk_mq_get_ctx(q);
|
|
|
|
|
|
+ if (likely(!data->ctx)) {
|
|
|
|
+ data->ctx = blk_mq_get_ctx(q);
|
|
|
|
+ put_ctx_on_error = true;
|
|
|
|
+ }
|
|
if (likely(!data->hctx))
|
|
if (likely(!data->hctx))
|
|
data->hctx = blk_mq_map_queue(q, data->ctx->cpu);
|
|
data->hctx = blk_mq_map_queue(q, data->ctx->cpu);
|
|
if (op & REQ_NOWAIT)
|
|
if (op & REQ_NOWAIT)
|
|
@@ -361,8 +363,8 @@ static struct request *blk_mq_get_request(struct request_queue *q,
|
|
|
|
|
|
tag = blk_mq_get_tag(data);
|
|
tag = blk_mq_get_tag(data);
|
|
if (tag == BLK_MQ_TAG_FAIL) {
|
|
if (tag == BLK_MQ_TAG_FAIL) {
|
|
- if (local_ctx) {
|
|
|
|
- blk_mq_put_ctx(local_ctx);
|
|
|
|
|
|
+ if (put_ctx_on_error) {
|
|
|
|
+ blk_mq_put_ctx(data->ctx);
|
|
data->ctx = NULL;
|
|
data->ctx = NULL;
|
|
}
|
|
}
|
|
blk_queue_exit(q);
|
|
blk_queue_exit(q);
|