On Wed, Feb 22, 2023 at 11:52:25AM -0700, Uday Shankar wrote: > 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); > + return blk_queue_get_max_segments(rq->q, req_op(rq)); > } I think you should just move this function to blk.h instead of introducing a new one.