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

blk-mq: Delete busy_iter_fn 



Typedefs busy_iter_fn and busy_tag_iter_fn are now identical, so delete
busy_iter_fn to reduce duplication.

It would be nicer to delete busy_tag_iter_fn, as the name busy_iter_fn is
less specific.

However busy_tag_iter_fn is used in many different parts of the tree,
unlike busy_iter_fn which is just use in block/, so just take the
straightforward path now, so that we could rename later treewide.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarMing Lei <ming.lei@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Tested-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Link: https://lore.kernel.org/r/1638794990-137490-3-git-send-email-john.garry@huawei.com


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

block/blk-mq-tag.c

+3 −3
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ void blk_mq_put_tags(struct blk_mq_tags *tags, int *tag_array, int nr_tags) 


struct bt_iter_data {

	struct blk_mq_hw_ctx *hctx;

	busy_iter_fn *fn;

	busy_tag_iter_fn *fn;

	void *data;

	bool reserved;

};
@@ -274,7 +274,7 @@ static bool bt_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) 
 *		bitmap_tags member of struct blk_mq_tags.

 */

static void bt_for_each(struct blk_mq_hw_ctx *hctx, struct sbitmap_queue *bt,

			busy_iter_fn *fn, void *data, bool reserved)

			busy_tag_iter_fn *fn, void *data, bool reserved)

{

	struct bt_iter_data iter_data = {

		.hctx = hctx,
@@ -457,7 +457,7 @@ EXPORT_SYMBOL(blk_mq_tagset_wait_completed_request); 
 * called for all requests on all queues that share that tag set and not only

 * for requests associated with @q.

 */

void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn,

void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_tag_iter_fn *fn,

		void *priv)

{

	struct blk_mq_hw_ctx *hctx;

block/blk-mq-tag.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ extern void blk_mq_tag_resize_shared_tags(struct blk_mq_tag_set *set, 
extern void blk_mq_tag_update_sched_shared_tags(struct request_queue *q);



extern void blk_mq_tag_wakeup_all(struct blk_mq_tags *tags, bool);

void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_iter_fn *fn,

void blk_mq_queue_tag_busy_iter(struct request_queue *q, busy_tag_iter_fn *fn,

		void *priv);

void blk_mq_all_tag_iter(struct blk_mq_tags *tags, busy_tag_iter_fn *fn,

		void *priv);

include/linux/blk-mq.h

+0 −1
Original line number Diff line number Diff line
@@ -470,7 +470,6 @@ struct blk_mq_queue_data { 
	bool last;

};



typedef bool (busy_iter_fn)(struct request *, void *, bool);

typedef bool (busy_tag_iter_fn)(struct request *, void *, bool);



/**