[PATCH v2 2/3] blk-mq: fix leak of q->stats
From: Omar Sandoval <osandov@osandov.com>
Date: 2017-03-28 23:13:40
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
From: Omar Sandoval <osandov@osandov.com>
Date: 2017-03-28 23:13:40
Subsystem:
block layer, the rest · Maintainers:
Jens Axboe, Linus Torvalds
From: Omar Sandoval <redacted>
blk_alloc_queue_node() already allocates q->stats, so
blk_mq_init_allocated_queue() is overwriting it with a new allocation.
Fixes: a83b576c9c25 ("block: fix stacked driver stats init and free")
Reviewed-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Omar Sandoval <redacted>
---
block/blk-mq.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 7df9dbfab022..00eeef31db30 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c@@ -2212,10 +2212,6 @@ struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, /* mark the queue as mq asap */ q->mq_ops = set->ops; - q->stats = blk_alloc_queue_stats(); - if (!q->stats) - goto err_exit; - q->poll_cb = blk_stat_alloc_callback(blk_mq_poll_stats_fn, blk_stat_rq_ddir, 2, q); if (!q->poll_cb)
--
2.12.1