From: majianpeng <majianpeng@gmail.com>
Date: Wed, 30 Nov 2011 14:47:48 +0000 (+0100)
Subject: cfq-iosched: free cic_index if blkio_alloc_blkg_stats fails
X-Git-Tag: firefly_0821_release~7541^2~2082
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8f8a594251e5260f53d746887890d0d2185ceebb;p=firefly-linux-kernel-4.4.55.git

cfq-iosched: free cic_index if blkio_alloc_blkg_stats fails

commit 2984ff38ccf6cbc02a7a996a36c7d6f69f3c6146 upstream.

If we fail allocating the blkpg stats, we free cfqd and cfgq.
But we need to free the IDA cfqd->cic_index as well.

Signed-off-by: majianpeng <majianpeng@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index ae21919f15e1..aae94473b581 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -4015,6 +4015,11 @@ static void *cfq_init_queue(struct request_queue *q)
 
 	if (blkio_alloc_blkg_stats(&cfqg->blkg)) {
 		kfree(cfqg);
+
+		spin_lock(&cic_index_lock);
+		ida_remove(&cic_index_ida, cfqd->cic_index);
+		spin_unlock(&cic_index_lock);
+
 		kfree(cfqd);
 		return NULL;
 	}