diff options
| author | weiping zhang <zhangweiping@didichuxing.com> | 2017-09-30 09:01:48 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-09-30 10:17:37 +0200 |
| commit | 547248736ae54b73e713ee259a81ab3a637cb2f7 (patch) | |
| tree | f3014c0d72cd5f637f301c195a69681f8548170f /block/blk-mq.c | |
| parent | null_blk: add "no_sched" module parameter (diff) | |
| download | linux-547248736ae54b73e713ee259a81ab3a637cb2f7.tar.xz linux-547248736ae54b73e713ee259a81ab3a637cb2f7.zip | |
blk-mq: remove unused function hctx_allow_merges
since 9bddeb2a5b981 "blk-mq: make per-sw-queue bio merge as default .bio_merge"
there is no caller for this function.
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: weiping zhang <zhangweiping@didichuxing.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq.c')
| -rw-r--r-- | block/blk-mq.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index 98a18609755e..59687ed6561b 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1504,12 +1504,6 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio) blk_account_io_start(rq, true); } -static inline bool hctx_allow_merges(struct blk_mq_hw_ctx *hctx) -{ - return (hctx->flags & BLK_MQ_F_SHOULD_MERGE) && - !blk_queue_nomerges(hctx->queue); -} - static inline void blk_mq_queue_io(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *ctx, struct request *rq) |