[PATCH 08/14] blk-mq: Get rid of unnecessary blk_mq_free_hw_queues()

2016-09-18 Thread Alexander Gordeev
CC: linux-bl...@vger.kernel.org
Signed-off-by: Alexander Gordeev 
---
 block/blk-mq.c | 13 +
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index b2ef8f5..3efb700 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1686,17 +1686,8 @@ static void blk_mq_exit_hw_queues(struct request_queue 
*q,
struct blk_mq_hw_ctx *hctx;
unsigned int i;
 
-   queue_for_each_hw_ctx(q, hctx, i)
-   blk_mq_exit_hctx(q, set, hctx, i);
-}
-
-static void blk_mq_free_hw_queues(struct request_queue *q,
-   struct blk_mq_tag_set *set)
-{
-   struct blk_mq_hw_ctx *hctx;
-   unsigned int i;
-
queue_for_each_hw_ctx(q, hctx, i) {
+   blk_mq_exit_hctx(q, set, hctx, i);
free_cpumask_var(hctx->cpumask);
kfree(hctx->ctxs);
kfree(hctx);
@@ -2120,9 +2111,7 @@ void blk_mq_free_queue(struct request_queue *q)
mutex_unlock(_q_mutex);
 
blk_mq_del_queue_tag_set(q);
-
blk_mq_exit_hw_queues(q, set);
-   blk_mq_free_hw_queues(q, set);
 }
 
 /* Basically redo blk_mq_init_queue with queue frozen */
-- 
1.8.3.1



[PATCH 08/14] blk-mq: Get rid of unnecessary blk_mq_free_hw_queues()

2016-09-18 Thread Alexander Gordeev
CC: linux-bl...@vger.kernel.org
Signed-off-by: Alexander Gordeev 
---
 block/blk-mq.c | 13 +
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index b2ef8f5..3efb700 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1686,17 +1686,8 @@ static void blk_mq_exit_hw_queues(struct request_queue 
*q,
struct blk_mq_hw_ctx *hctx;
unsigned int i;
 
-   queue_for_each_hw_ctx(q, hctx, i)
-   blk_mq_exit_hctx(q, set, hctx, i);
-}
-
-static void blk_mq_free_hw_queues(struct request_queue *q,
-   struct blk_mq_tag_set *set)
-{
-   struct blk_mq_hw_ctx *hctx;
-   unsigned int i;
-
queue_for_each_hw_ctx(q, hctx, i) {
+   blk_mq_exit_hctx(q, set, hctx, i);
free_cpumask_var(hctx->cpumask);
kfree(hctx->ctxs);
kfree(hctx);
@@ -2120,9 +2111,7 @@ void blk_mq_free_queue(struct request_queue *q)
mutex_unlock(_q_mutex);
 
blk_mq_del_queue_tag_set(q);
-
blk_mq_exit_hw_queues(q, set);
-   blk_mq_free_hw_queues(q, set);
 }
 
 /* Basically redo blk_mq_init_queue with queue frozen */
-- 
1.8.3.1