Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 793597a6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

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: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent a3bd7756

block/blk-mq.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -1179,12 +1179,14 @@ static struct request *blk_mq_map_request(struct request_queue *q, 
	trace_block_getrq(q, bio, rw);

	trace_block_getrq(q, bio, rw);

	rq = __blk_mq_alloc_request(q, hctx, ctx, rw, GFP_ATOMIC, false);

	rq = __blk_mq_alloc_request(q, hctx, ctx, rw, GFP_ATOMIC, false);

	if (unlikely(!rq)) {

	if (unlikely(!rq)) {

		__blk_mq_run_hw_queue(hctx);

		blk_mq_put_ctx(ctx);

		blk_mq_put_ctx(ctx);

		trace_block_sleeprq(q, bio, rw);

		trace_block_sleeprq(q, bio, rw);

		rq = blk_mq_alloc_request_pinned(q, rw, __GFP_WAIT|GFP_ATOMIC,



							false);

		ctx = blk_mq_get_ctx(q);

		ctx = rq->mq_ctx;

		hctx = q->mq_ops->map_queue(q, ctx->cpu);

		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++;

	hctx->queued++;