projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7d8d001
)
block: remove extra calls to wbt_exit()
author
Omar Sandoval
<osandov@fb.com>
Tue, 21 Mar 2017 15:56:05 +0000
(08:56 -0700)
committer
Jens Axboe
<axboe@fb.com>
Tue, 21 Mar 2017 16:03:08 +0000
(10:03 -0600)
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>
block/blk-core.c
patch
|
blob
|
history
block/blk-mq.c
patch
|
blob
|
history
diff --git
a/block/blk-core.c
b/block/blk-core.c
index
d772c22
..
e8a9bc0
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
a4546f0
..
534f49a
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);