Merge tag 'block-6.3-2023-03-03' of git://git.kernel.dk/linux

[sfrench/cifs-2.6.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 1ac782fdc55c58c7356753ba4777f9cf6c076519..6460abdb24267cc054350b44781a4d386f8e1edf 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -587,13 +587,6 @@ int __blk_rq_map_sg(struct request_queue *q, struct request *rq,
 }
 EXPORT_SYMBOL(__blk_rq_map_sg);
 
-static inline unsigned int blk_rq_get_max_segments(struct request *rq)
-{
-       if (req_op(rq) == REQ_OP_DISCARD)
-               return queue_max_discard_segments(rq->q);
-       return queue_max_segments(rq->q);
-}
-
 static inline unsigned int blk_rq_get_max_sectors(struct request *rq,
                                                  sector_t offset)
 {