| Message ID | 20211013171215.1177671-5-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/6] block: factor out a chunk_size_left helper | expand |
diff --git a/block/blk-merge.c b/block/blk-merge.c index 8ed50952e93ad..3e9dde152fdcd 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -605,8 +605,8 @@ static inline unsigned int blk_rq_get_max_sectors(struct request *rq, req_op(rq) == REQ_OP_DISCARD || req_op(rq) == REQ_OP_SECURE_ERASE) return max_sectors; - - return min(max_sectors, blk_max_size_offset(q, offset, 0)); + return min(max_sectors, + blk_chunk_sectors_left(offset, q->limits.chunk_sectors)); } static inline int ll_new_hw_segment(struct request *req, struct bio *bio,
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 <hch@lst.de> --- block/blk-merge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)