diff options
| author | Omar Sandoval <osandov@fb.com> | 2017-03-21 08:56:05 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-03-21 10:03:08 -0600 |
| commit | 0315b159085621d2ff72dbf69ca6fb4a5b32bae2 (patch) | |
| tree | dc221b845edfce8f3cdc2bc44dab112463320a7b | |
| parent | 7d8d00140715a115193bf502fa3b0cfe620f0dd9 (diff) | |
| download | linux-0-day-0315b159085621d2ff72dbf69ca6fb4a5b32bae2.tar.gz linux-0-day-0315b159085621d2ff72dbf69ca6fb4a5b32bae2.tar.xz | |
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 <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | block/blk-core.c | 1 | ||||
| -rw-r--r-- | block/blk-mq.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index d772c221cc178..e8a9bc0d4bbb4 100644 --- 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 a4546f060e809..534f49a90e3a4 100644 --- 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); |