blk_rq_get_max_sectors always uses q->limits.chunk_sectors as the chunk_sectors argument, and already checks for max_sectors through the call to blk_queue_get_max_sectors. That means much of blk_max_size_offset is not needed and open coding it simplifies the code.
Signed-off-by: Christoph Hellwig <[email protected]> --- block/blk-merge.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index 14ce19607cd8a..b3da43160032f 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -595,17 +595,18 @@ static inline unsigned int blk_rq_get_max_sectors(struct request *rq, sector_t offset) { struct request_queue *q = rq->q; + unsigned int max_sectors; if (blk_rq_is_passthrough(rq)) return q->limits.max_hw_sectors; - if (!q->limits.chunk_sectors || - req_op(rq) == REQ_OP_DISCARD || - req_op(rq) == REQ_OP_SECURE_ERASE) - return blk_queue_get_max_sectors(q, req_op(rq)); - - return min(blk_max_size_offset(q, offset, 0), - blk_queue_get_max_sectors(q, req_op(rq))); + max_sectors = blk_queue_get_max_sectors(q, req_op(rq)); + if (q->limits.chunk_sectors && + req_op(rq) != REQ_OP_DISCARD && + req_op(rq) != REQ_OP_SECURE_ERASE) + max_sectors = min(max_sectors, + chunk_size_left(offset, q->limits.chunk_sectors)); + return max_sectors; } static inline int ll_new_hw_segment(struct request *req, struct bio *bio, -- 2.30.2 -- dm-devel mailing list [email protected] https://listman.redhat.com/mailman/listinfo/dm-devel
