From: Omar Sandoval <osandov@fb.com>
Date: Tue, 28 Mar 2017 23:12:16 +0000 (-0700)
Subject: blk-mq: fix leak of q->stats
X-Git-Tag: v4.14-rc1~1015^2~262
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c9539a431bd4e4cbe475eb17e587f3ac06f2ae2;p=platform%2Fkernel%2Flinux-rpi3.git

blk-mq: fix leak of q->stats

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 <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 0ed00ec..1827768 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2234,10 +2234,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)