blk-mq: do not use blk_mq_alloc_request_pinned in blk_mq_map_request

We already do a non-blocking allocation in blk_mq_map_request, no need
to repeat it.  Just call __blk_mq_alloc_request to wait directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 3224888d329a454949dfdc59246585cf7afea76d..43f0c8ffa92a3fd35966f651dda31fbf3a8cbf32 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1179,12 +1179,14 @@ static struct request *blk_mq_map_request(struct request_queue *q,
        trace_block_getrq(q, bio, rw);
        rq = __blk_mq_alloc_request(q, hctx, ctx, rw, GFP_ATOMIC, false);
        if (unlikely(!rq)) {
+               __blk_mq_run_hw_queue(hctx);
                blk_mq_put_ctx(ctx);
                trace_block_sleeprq(q, bio, rw);
-               rq = blk_mq_alloc_request_pinned(q, rw, __GFP_WAIT|GFP_ATOMIC,
-                                                       false);
-               ctx = rq->mq_ctx;
+
+               ctx = blk_mq_get_ctx(q);
                hctx = q->mq_ops->map_queue(q, ctx->cpu);
+               rq = __blk_mq_alloc_request(q, hctx, ctx, rw,
+                                           __GFP_WAIT|GFP_ATOMIC, false);
        }
 
        hctx->queued++;