]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
blk-mq: remove unused function hctx_allow_merges
authorweiping zhang <zhangweiping@didichuxing.com>
Sat, 30 Sep 2017 07:01:48 +0000 (15:01 +0800)
committerJens Axboe <axboe@kernel.dk>
Sat, 30 Sep 2017 08:17:37 +0000 (02:17 -0600)
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>
block/blk-mq.c

index 98a18609755e94494b4239012f3c57c1503635bf..59687ed6561b9b2a6c25e2af272305334c763152 100644 (file)
@@ -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)