From 4c74725f9138d1103c6125b18315e1b68664a8ac Mon Sep 17 00:00:00 2001
From: Paul Menage <menage@google.com>
Date: Thu, 29 Jan 2009 14:25:22 -0800
Subject: [PATCH] --- yaml --- r: 130393 b: refs/heads/master c:
 839ec5452ebfd5905b9c69b20ceb640903a8ea1a h: refs/heads/master i:   130391:
 32d32cd7fd7ca1d6a9b16d7f7d6062926ec4793d v: v3

---
 [refs]                | 2 +-
 trunk/kernel/cgroup.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3a72f050c16c..c5a7e3f53f5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 804b3c28a4e4fa1c224571bf76edb534b9c4b1ed
+refs/heads/master: 839ec5452ebfd5905b9c69b20ceb640903a8ea1a
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index 492215d67fa5..5a54ff42874e 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -1115,8 +1115,10 @@ static void cgroup_kill_sb(struct super_block *sb) {
 	}
 	write_unlock(&css_set_lock);
 
-	list_del(&root->root_list);
-	root_count--;
+	if (!list_empty(&root->root_list)) {
+		list_del(&root->root_list);
+		root_count--;
+	}
 
 	mutex_unlock(&cgroup_mutex);