| Message ID | 1635852455-39935-3-git-send-email-john.garry@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | blk-mq: Optimise blk_mq_queue_tag_busy_iter() for shared tags | expand |
On Tue, Nov 02, 2021 at 07:27:34PM +0800, John Garry wrote: > 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: John Garry <john.garry@huawei.com> Reviewed-by: Ming Lei <ming.lei@redhat.com>
On 11/2/21 12:27 PM, John Garry wrote: > 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: John Garry <john.garry@huawei.com> > --- > block/blk-mq-tag.c | 6 +++--- > block/blk-mq-tag.h | 2 +- > include/linux/blk-mq.h | 1 - > 3 files changed, 4 insertions(+), 5 deletions(-) > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 0d773c44a7ec..bc233ea92adf 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -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; diff --git a/block/blk-mq-tag.h b/block/blk-mq-tag.h index df787b5a23bd..5668e28be0b7 100644 --- a/block/blk-mq-tag.h +++ b/block/blk-mq-tag.h @@ -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); diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index da8de0d6f99b..2344c68bff35 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -479,7 +479,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); /**
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: John Garry <john.garry@huawei.com> --- block/blk-mq-tag.c | 6 +++--- block/blk-mq-tag.h | 2 +- include/linux/blk-mq.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-)