summaryrefslogtreecommitdiff
path: root/block/blk-core.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-05-27 20:59:46 +0200
committerJens Axboe <axboe@fb.com>2014-05-28 09:49:19 -0600
commit4ce01dd1a07d9cf3eaf44fbf4ea9a61b11badccc (patch)
treed3314a1d9affb10f9397d4351df26f4a95a5f047 /block/blk-core.c
parent6fca6a611c27f1f0d90fbe1cc3c229dbf8c09e48 (diff)
downloadkernel-4ce01dd1a07d9cf3eaf44fbf4ea9a61b11badccc.tar.gz
blk-mq: merge blk_mq_alloc_reserved_request into blk_mq_alloc_request
Instead of having two almost identical copies of the same code just let the callers pass in the reserved flag directly. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-core.c')
-rw-r--r--block/blk-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 29d5fbafd94a..d87be5b4e554 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1173,7 +1173,7 @@ static struct request *blk_old_get_request(struct request_queue *q, int rw,
struct request *blk_get_request(struct request_queue *q, int rw, gfp_t gfp_mask)
{
if (q->mq_ops)
- return blk_mq_alloc_request(q, rw, gfp_mask);
+ return blk_mq_alloc_request(q, rw, gfp_mask, false);
else
return blk_old_get_request(q, rw, gfp_mask);
}