diff options
| author | Jens Axboe <axboe@kernel.dk> | 2018-10-24 21:52:28 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-11-07 21:42:32 +0100 |
| commit | 92bc5a24844ada9b010f03c49a493e3edeadaa54 (patch) | |
| tree | c2f56eefa07ff2a233e3be817feaa3f7b959a23e /block | |
| parent | block: get rid of MQ scheduler ops union (diff) | |
| download | linux-92bc5a24844ada9b010f03c49a493e3edeadaa54.tar.xz linux-92bc5a24844ada9b010f03c49a493e3edeadaa54.zip | |
block: remove __blk_put_request()
Now there's no difference between blk_put_request() and
__blk_put_request() anymore, get rid of the underscore version and
convert the few callers.
Reviewed-by: Hannes Reinecke <hare@suse.com>
Tested-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 9 | ||||
| -rw-r--r-- | block/blk-merge.c | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 18538a41a532..700dd4587282 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -803,15 +803,6 @@ void part_round_stats(struct request_queue *q, int cpu, struct hd_struct *part) } EXPORT_SYMBOL_GPL(part_round_stats); -void __blk_put_request(struct request_queue *q, struct request *req) -{ - if (unlikely(!q)) - return; - - blk_mq_free_request(req); -} -EXPORT_SYMBOL_GPL(__blk_put_request); - void blk_put_request(struct request *req) { blk_mq_free_request(req); diff --git a/block/blk-merge.c b/block/blk-merge.c index c068c30b0c35..3d073305da33 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -866,7 +866,7 @@ int blk_attempt_req_merge(struct request_queue *q, struct request *rq, free = attempt_merge(q, rq, next); if (free) { - __blk_put_request(q, free); + blk_put_request(free); return 1; } |