Commit 8d1dfd51 authored by John Garry's avatar John Garry Committed by Jens Axboe
Browse files

block: Pass blk_queue_get_max_sectors() a request pointer 



Currently blk_queue_get_max_sectors() is passed a enum req_op. In future
the value returned from blk_queue_get_max_sectors() may depend on certain
request flags, so pass a request pointer.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20240620125359.2684798-2-john.g.garry@oracle.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent e821bcec

block/blk-merge.c

+2 −1
Original line number Diff line number Diff line
@@ -593,7 +593,8 @@ static inline unsigned int blk_rq_get_max_sectors(struct request *rq, 
	if (blk_rq_is_passthrough(rq))

		return q->limits.max_hw_sectors;



	max_sectors = blk_queue_get_max_sectors(q, req_op(rq));

	max_sectors = blk_queue_get_max_sectors(rq);



	if (!q->limits.chunk_sectors ||

	    req_op(rq) == REQ_OP_DISCARD ||

	    req_op(rq) == REQ_OP_SECURE_ERASE)

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -3036,7 +3036,7 @@ void blk_mq_submit_bio(struct bio *bio) 
blk_status_t blk_insert_cloned_request(struct request *rq)

{

	struct request_queue *q = rq->q;

	unsigned int max_sectors = blk_queue_get_max_sectors(q, req_op(rq));

	unsigned int max_sectors = blk_queue_get_max_sectors(rq);

	unsigned int max_segments = blk_rq_get_max_segments(rq);

	blk_status_t ret;

block/blk.h

+4 −2
Original line number Diff line number Diff line
@@ -182,9 +182,11 @@ static inline unsigned int blk_rq_get_max_segments(struct request *rq) 
	return queue_max_segments(rq->q);

}



static inline unsigned int blk_queue_get_max_sectors(struct request_queue *q,

						     enum req_op op)

static inline unsigned int blk_queue_get_max_sectors(struct request *rq)

{

	struct request_queue *q = rq->q;

	enum req_op op = req_op(rq);



	if (unlikely(op == REQ_OP_DISCARD || op == REQ_OP_SECURE_ERASE))

		return min(q->limits.max_discard_sectors,

			   UINT_MAX >> SECTOR_SHIFT);