---

yaml --- r: 320796 b: refs/heads/master c: 567fb43 h: refs/heads/master v: v3
git-mirror · Aug 1, 2012 · 574c455 · 574c455
1 parent 545017f
commit 574c455
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca28ddc908fcfef0e5c1b6e5df632db7fc26de10
+refs/heads/master: 567fb435bb7a37afda35902b884562c40756dc45
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -3764,6 +3764,10 @@ static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft,
 		parent_memcg = mem_cgroup_from_cont(parent);
 
 	cgroup_lock();
+
+	if (memcg->use_hierarchy == val)
+		goto out;
+
 	/*
 	 * If parent's use_hierarchy is set, we can't make any modifications
 	 * in the child subtrees. If it is unset, then the change can
@@ -3780,6 +3784,8 @@ static int mem_cgroup_hierarchy_write(struct cgroup *cont, struct cftype *cft,
 			retval = -EBUSY;
 	} else
 		retval = -EINVAL;
+
+out:
 	cgroup_unlock();
 
 	return retval;