From 9e7fe5a2b4d8438828713a85d586a212f618ab8b Mon Sep 17 00:00:00 2001
From: Vivek Goyal <vgoyal@redhat.com>
Date: Tue, 2 Aug 2011 09:24:09 +0200
Subject: [PATCH] --- yaml --- r: 263134 b: refs/heads/master c:
 a5395b83b78f62ccf5e3af854aacd025c2a6e7b5 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/block/cfq-iosched.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f0ec6aefbb31..8e8ca22052c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5a94f56845bb4b272d82e84b5a1e2080b07ba82
+refs/heads/master: a5395b83b78f62ccf5e3af854aacd025c2a6e7b5
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 1f96ad6254f1..650834537606 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -1209,6 +1209,9 @@ static void cfq_destroy_cfqg(struct cfq_data *cfqd, struct cfq_group *cfqg)
 
 	hlist_del_init(&cfqg->cfqd_node);
 
+	BUG_ON(cfqd->nr_blkcg_linked_grps <= 0);
+	cfqd->nr_blkcg_linked_grps--;
+
 	/*
 	 * Put the reference taken at the time of creation so that when all
 	 * queues are gone, group can be destroyed.