Commit 9bdb4833 authored by John Garry's avatar John Garry Committed by Jens Axboe
Browse files

blk-mq: Drop blk_mq_ops.timeout 'reserved' arg 



With new API blk_mq_is_reserved_rq() we can tell if a request is from
the reserved pool, so stop passing 'reserved' arg. There is actually
only a single user of that arg for all the callback implementations, which
can use blk_mq_is_reserved_rq() instead.

This will also allow us to stop passing the same 'reserved' around the
blk-mq iter functions next.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org> # For MMC
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/1657109034-206040-4-git-send-email-john.garry@huawei.com


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

block/blk-mq.c

+3 −3
Original line number Diff line number Diff line
@@ -1427,13 +1427,13 @@ bool blk_mq_queue_inflight(struct request_queue *q) 
}

EXPORT_SYMBOL_GPL(blk_mq_queue_inflight);



static void blk_mq_rq_timed_out(struct request *req, bool reserved)

static void blk_mq_rq_timed_out(struct request *req)

{

	req->rq_flags |= RQF_TIMED_OUT;

	if (req->q->mq_ops->timeout) {

		enum blk_eh_timer_return ret;



		ret = req->q->mq_ops->timeout(req, reserved);

		ret = req->q->mq_ops->timeout(req);

		if (ret == BLK_EH_DONE)

			return;

		WARN_ON_ONCE(ret != BLK_EH_RESET_TIMER);
@@ -1482,7 +1482,7 @@ static bool blk_mq_check_expired(struct request *rq, void *priv, bool reserved) 
	 * from blk_mq_check_expired().

	 */

	if (blk_mq_req_expired(rq, next))

		blk_mq_rq_timed_out(rq, reserved);

		blk_mq_rq_timed_out(rq);

	return true;

}

block/bsg-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ void bsg_remove_queue(struct request_queue *q) 
}

EXPORT_SYMBOL_GPL(bsg_remove_queue);



static enum blk_eh_timer_return bsg_timeout(struct request *rq, bool reserved)

static enum blk_eh_timer_return bsg_timeout(struct request *rq)

{

	struct bsg_set *bset =

		container_of(rq->q->tag_set, struct bsg_set, tag_set);

drivers/block/mtip32xx/mtip32xx.c

+2 −3
Original line number Diff line number Diff line
@@ -3357,12 +3357,11 @@ static int mtip_init_cmd(struct blk_mq_tag_set *set, struct request *rq, 
	return 0;

}



static enum blk_eh_timer_return mtip_cmd_timeout(struct request *req,

								bool reserved)

static enum blk_eh_timer_return mtip_cmd_timeout(struct request *req)

{

	struct driver_data *dd = req->q->queuedata;



	if (reserved) {

	if (blk_mq_is_reserved_rq(req)) {

		struct mtip_cmd *cmd = blk_mq_rq_to_pdu(req);



		cmd->status = BLK_STS_TIMEOUT;

drivers/block/nbd.c

+1 −2
Original line number Diff line number Diff line
@@ -393,8 +393,7 @@ static u32 req_to_nbd_cmd_type(struct request *req) 
	}

}



static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req,

						 bool reserved)

static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req)

{

	struct nbd_cmd *cmd = blk_mq_rq_to_pdu(req);

	struct nbd_device *nbd = cmd->nbd;

drivers/block/null_blk/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1578,7 +1578,7 @@ static int null_poll(struct blk_mq_hw_ctx *hctx, struct io_comp_batch *iob) 
	return nr;

}



static enum blk_eh_timer_return null_timeout_rq(struct request *rq, bool res)

static enum blk_eh_timer_return null_timeout_rq(struct request *rq)

{

	struct blk_mq_hw_ctx *hctx = rq->mq_hctx;

	struct nullb_cmd *cmd = blk_mq_rq_to_pdu(rq);