block: remove extra calls to wbt_exit()

We always call wbt_exit() from blk_release_queue(), so these are
unnecessary.

Signed-off-by: Omar Sandoval <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>

diff --git a/block/blk-core.c b/block/blk-core.c
index d772c221cc178bf3ecfe448f3367121ec1d077de..e8a9bc0d4bbb4f6ee4532ee0ae7d12fbee26b270 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -889,7 +889,6 @@ out_exit_flush_rq:
                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 a4546f060e80933423638f1399ab1922db8331a9..534f49a90e3a4fd2c8d88eaa422cc30df3c1c10c 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2431,8 +2431,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);