Commit 2dd6532e authored by John Garry's avatar John Garry Committed by Jens Axboe
Browse files

blk-mq: Drop 'reserved' arg of busy_tag_iter_fn 



We no longer use the 'reserved' arg in busy_tag_iter_fn for any iter
function so it may be dropped.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me> #nvme
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/1657109034-206040-6-git-send-email-john.garry@huawei.com


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

block/blk-mq-debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ struct show_busy_params { 
 * e.g. due to a concurrent blk_mq_finish_request() call. Returns true to

 * keep iterating requests.

 */

static bool hctx_show_busy_rq(struct request *rq, void *data, bool reserved)

static bool hctx_show_busy_rq(struct request *rq, void *data)

{

	const struct show_busy_params *params = data;

block/blk-mq-tag.c

+3 −4
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static bool bt_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) 
		return true;



	if (rq->q == q && (!hctx || rq->mq_hctx == hctx))

		ret = iter_data->fn(rq, iter_data->data, reserved);

		ret = iter_data->fn(rq, iter_data->data);

	blk_mq_put_rq_ref(rq);

	return ret;

}
@@ -354,7 +354,7 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) 


	if (!(iter_data->flags & BT_TAG_ITER_STARTED) ||

	    blk_mq_request_started(rq))

		ret = iter_data->fn(rq, iter_data->data, reserved);

		ret = iter_data->fn(rq, iter_data->data);

	if (!iter_static_rqs)

		blk_mq_put_rq_ref(rq);

	return ret;
@@ -444,8 +444,7 @@ void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset, 
}

EXPORT_SYMBOL(blk_mq_tagset_busy_iter);



static bool blk_mq_tagset_count_completed_rqs(struct request *rq,

		void *data, bool reserved)

static bool blk_mq_tagset_count_completed_rqs(struct request *rq, void *data)

{

	unsigned *count = data;

block/blk-mq.c

+4 −6
Original line number Diff line number Diff line
@@ -129,8 +129,7 @@ struct mq_inflight { 
	unsigned int inflight[2];

};



static bool blk_mq_check_inflight(struct request *rq, void *priv,

				  bool reserved)

static bool blk_mq_check_inflight(struct request *rq, void *priv)

{

	struct mq_inflight *mi = priv;
@@ -1400,8 +1399,7 @@ void blk_mq_delay_kick_requeue_list(struct request_queue *q, 
}

EXPORT_SYMBOL(blk_mq_delay_kick_requeue_list);



static bool blk_mq_rq_inflight(struct request *rq, void *priv,

			       bool reserved)

static bool blk_mq_rq_inflight(struct request *rq, void *priv)

{

	/*

	 * If we find a request that isn't idle we know the queue is busy
@@ -1470,7 +1468,7 @@ void blk_mq_put_rq_ref(struct request *rq) 
		__blk_mq_free_request(rq);

}



static bool blk_mq_check_expired(struct request *rq, void *priv, bool reserved)

static bool blk_mq_check_expired(struct request *rq, void *priv)

{

	unsigned long *next = priv;
@@ -3289,7 +3287,7 @@ struct rq_iter_data { 
	bool has_rq;

};



static bool blk_mq_has_request(struct request *rq, void *data, bool reserved)

static bool blk_mq_has_request(struct request *rq, void *data)

{

	struct rq_iter_data *iter_data = data;

drivers/block/mtip32xx/mtip32xx.c

+2 −2
Original line number Diff line number Diff line
@@ -2441,7 +2441,7 @@ static void mtip_softirq_done_fn(struct request *rq) 
	blk_mq_end_request(rq, cmd->status);

}



static bool mtip_abort_cmd(struct request *req, void *data, bool reserved)

static bool mtip_abort_cmd(struct request *req, void *data)

{

	struct mtip_cmd *cmd = blk_mq_rq_to_pdu(req);

	struct driver_data *dd = data;
@@ -2454,7 +2454,7 @@ static bool mtip_abort_cmd(struct request *req, void *data, bool reserved) 
	return true;

}



static bool mtip_queue_cmd(struct request *req, void *data, bool reserved)

static bool mtip_queue_cmd(struct request *req, void *data)

{

	struct driver_data *dd = data;

drivers/block/nbd.c

+1 −1
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ static void recv_work(struct work_struct *work) 
	kfree(args);

}



static bool nbd_clear_req(struct request *req, void *data, bool reserved)

static bool nbd_clear_req(struct request *req, void *data)

{

	struct nbd_cmd *cmd = blk_mq_rq_to_pdu(req);