Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

blk-mq: remove blk_mq_alloc_request_pinned

Browse source 
We now only have one caller left and can open code it there in a cleaner
way.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Christoph Hellwig 2014-05-27 20:59:50 +02:00 committed by Jens Axboe
parent 793597a6a9
commit d852564f8c
1 changed files with 16 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
block/blk-mq.c
View file

@ -264,46 +264,30 @@ __blk_mq_alloc_request(struct request_queue *q, struct blk_mq_hw_ctx *hctx,
return NULL; return NULL;
} }
static struct request *blk_mq_alloc_request_pinned(struct request_queue *q,
int rw, gfp_t gfp,
bool reserved)
{
bool gfp_mask = gfp & ~__GFP_WAIT;
struct request *rq;
do {
struct blk_mq_ctx *ctx = blk_mq_get_ctx(q);
struct blk_mq_hw_ctx *hctx = q->mq_ops->map_queue(q, ctx->cpu);
rq = __blk_mq_alloc_request(q, hctx, ctx, rw, gfp_mask,
reserved);
if (rq)
break;
if (!(gfp & __GFP_WAIT)) {
blk_mq_put_ctx(ctx);
break;
}
__blk_mq_run_hw_queue(hctx);
blk_mq_put_ctx(ctx);
gfp_mask = gfp;
} while (1);
return rq;
}
struct request *blk_mq_alloc_request(struct request_queue *q, int rw, gfp_t gfp, struct request *blk_mq_alloc_request(struct request_queue *q, int rw, gfp_t gfp,
bool reserved) bool reserved)
{ {
struct blk_mq_ctx *ctx;
struct blk_mq_hw_ctx *hctx;
struct request *rq; struct request *rq;
if (blk_mq_queue_enter(q)) if (blk_mq_queue_enter(q))
return NULL; return NULL;
rq = blk_mq_alloc_request_pinned(q, rw, gfp, reserved); ctx = blk_mq_get_ctx(q);
if (rq) hctx = q->mq_ops->map_queue(q, ctx->cpu);
blk_mq_put_ctx(rq->mq_ctx);
rq = __blk_mq_alloc_request(q, hctx, ctx, rw, gfp & ~__GFP_WAIT,
reserved);
if (!rq && (gfp & __GFP_WAIT)) {
__blk_mq_run_hw_queue(hctx);
blk_mq_put_ctx(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, reserved);
}
blk_mq_put_ctx(ctx);
return rq; return rq;
} }
EXPORT_SYMBOL(blk_mq_alloc_request); EXPORT_SYMBOL(blk_mq_alloc_request);