mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
blk-mq: drop the tag_set argument from blk_mq_free_rq_map/tags
Commit 9ad8e5af32 ("blk-mq: Pass tag_set to blk_mq_free_rq_map/tags")
added the argument so that both helpers could reach the tag set's
tags_srcu. Now that the SRCU instance is global, nothing uses it.
Remove it.
No functional change.
Signed-off-by: Qiliang Yuan <[email protected]>
Reviewed-by: Ming Lei <[email protected]>
Acked-by: Paul E. McKenney <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
+1
-1
@@ -614,7 +614,7 @@ static void blk_mq_free_tags_callback(struct rcu_head *head)
|
||||
kfree(tags);
|
||||
}
|
||||
|
||||
void blk_mq_free_tags(struct blk_mq_tag_set *set, struct blk_mq_tags *tags)
|
||||
void blk_mq_free_tags(struct blk_mq_tags *tags)
|
||||
{
|
||||
sbitmap_queue_free(&tags->bitmap_tags);
|
||||
sbitmap_queue_free(&tags->breserved_tags);
|
||||
|
||||
+5
-5
@@ -3497,14 +3497,14 @@ void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,
|
||||
*/
|
||||
}
|
||||
|
||||
void blk_mq_free_rq_map(struct blk_mq_tag_set *set, struct blk_mq_tags *tags)
|
||||
void blk_mq_free_rq_map(struct blk_mq_tags *tags)
|
||||
{
|
||||
kfree(tags->rqs);
|
||||
tags->rqs = NULL;
|
||||
kfree(tags->static_rqs);
|
||||
tags->static_rqs = NULL;
|
||||
|
||||
blk_mq_free_tags(set, tags);
|
||||
blk_mq_free_tags(tags);
|
||||
}
|
||||
|
||||
static enum hctx_type hctx_idx_to_type(struct blk_mq_tag_set *set,
|
||||
@@ -3566,7 +3566,7 @@ static struct blk_mq_tags *blk_mq_alloc_rq_map(struct blk_mq_tag_set *set,
|
||||
err_free_rqs:
|
||||
kfree(tags->rqs);
|
||||
err_free_tags:
|
||||
blk_mq_free_tags(set, tags);
|
||||
blk_mq_free_tags(tags);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -4119,7 +4119,7 @@ struct blk_mq_tags *blk_mq_alloc_map_and_rqs(struct blk_mq_tag_set *set,
|
||||
|
||||
ret = blk_mq_alloc_rqs(set, tags, hctx_idx, depth);
|
||||
if (ret) {
|
||||
blk_mq_free_rq_map(set, tags);
|
||||
blk_mq_free_rq_map(tags);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -4147,7 +4147,7 @@ void blk_mq_free_map_and_rqs(struct blk_mq_tag_set *set,
|
||||
{
|
||||
if (tags) {
|
||||
blk_mq_free_rqs(set, tags, hctx_idx);
|
||||
blk_mq_free_rq_map(set, tags);
|
||||
blk_mq_free_rq_map(tags);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -62,7 +62,7 @@ void blk_mq_put_rq_ref(struct request *rq);
|
||||
*/
|
||||
void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags,
|
||||
unsigned int hctx_idx);
|
||||
void blk_mq_free_rq_map(struct blk_mq_tag_set *set, struct blk_mq_tags *tags);
|
||||
void blk_mq_free_rq_map(struct blk_mq_tags *tags);
|
||||
struct blk_mq_tags *blk_mq_alloc_map_and_rqs(struct blk_mq_tag_set *set,
|
||||
unsigned int hctx_idx, unsigned int depth);
|
||||
void blk_mq_free_map_and_rqs(struct blk_mq_tag_set *set,
|
||||
@@ -176,7 +176,7 @@ struct blk_mq_alloc_data {
|
||||
|
||||
struct blk_mq_tags *blk_mq_init_tags(unsigned int nr_tags,
|
||||
unsigned int reserved_tags, unsigned int flags, int node);
|
||||
void blk_mq_free_tags(struct blk_mq_tag_set *set, struct blk_mq_tags *tags);
|
||||
void blk_mq_free_tags(struct blk_mq_tags *tags);
|
||||
|
||||
extern struct srcu_struct blk_mq_tags_srcu;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user