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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Acked-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20240620125359.2684798-2-john.g.garry@oracle.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 8534c35e04976a8a59cefd9d321d7522768f4ae6..8957e08e020c2d04bda71a16a2ff0e3388524910 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -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)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index e2b9710ddc5ad19fb2c2ddbe0fca1e819a4cd4a4..47fe9d19b8f10903baa42d37849e245c212f64c9 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3036,7 +3036,7 @@ queue_exit:
 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;
 

diff --git a/block/blk.h b/block/blk.h
index fa32f7fad5d7e6ef9e0e5186b3dc3682285a7270..20c5718815e2e7be3803ed2496ffc72249ebbe41 100644 (file)
--- a/block/blk.h
+++ b/block/blk.h
@@ -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);