---

yaml --- r: 292682 b: refs/heads/master c: ca464d6 h: refs/heads/master v: v3
git-mirror · Mar 22, 2012 · 4756011 · 4756011
1 parent 4d4bbdd
commit 4756011
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42aee6c495e07dba7410b863a360db6bb9ec6d66
+refs/heads/master: ca464d69b19120a826aa2534de2511a6f542edf5
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
@@ -5033,17 +5033,16 @@ css_get_next(struct cgroup_subsys *ss, int id,
 		return NULL;
 
 	BUG_ON(!ss->use_id);
+	WARN_ON_ONCE(!rcu_read_lock_held());
+
 	/* fill start point for scan */
 	tmpid = id;
 	while (1) {
 		/*
 		 * scan next entry from bitmap(tree), tmpid is updated after
 		 * idr_get_next().
 		 */
-		spin_lock(&ss->id_lock);
 		tmp = idr_get_next(&ss->idr, &tmpid);
-		spin_unlock(&ss->id_lock);
-
 		if (!tmp)
 			break;
 		if (tmp->depth >= depth && tmp->stack[depth] == rootid) {