blk-mq: enforce op-specific segment limits in blk_insert_cloned_request

[linux-2.6-block.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 808b58129d3e4d91c844dd2ca629e368c5b810ad..ff72edd7ee0333a3193e99cb6503442810dd0cff 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -586,13 +586,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)
 {