From: Omar Sandoval <[email protected]> We always call wbt_exit() from blk_release_queue(), so these are unnecessary.
Signed-off-by: Omar Sandoval <[email protected]> --- block/blk-core.c | 1 - block/blk-mq.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 0eeb99ef654f..82425017c9b8 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -889,7 +889,6 @@ int blk_init_allocated_queue(struct request_queue *q) q->exit_rq_fn(q, q->fq->flush_rq); out_free_flush_queue: blk_free_flush_queue(q->fq); - wbt_exit(q); return -ENOMEM; } EXPORT_SYMBOL(blk_init_allocated_queue); diff --git a/block/blk-mq.c b/block/blk-mq.c index 159187a28d66..eb84daf550f4 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -2430,8 +2430,6 @@ void blk_mq_free_queue(struct request_queue *q) list_del_init(&q->all_q_node); mutex_unlock(&all_q_mutex); - wbt_exit(q); - blk_mq_del_queue_tag_set(q); blk_mq_exit_hw_queues(q, set, set->nr_hw_queues); -- 2.12.0
