diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index 6e0130922671..2b751bfa50e1 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c @@ -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); diff --git a/block/blk-mq.c b/block/blk-mq.c index d573123211e8..b264e4d0a778 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -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); } } diff --git a/block/blk-mq.h b/block/blk-mq.h index e6b463da5071..1e64236d34d4 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -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;