From 3d8bb2916868a328a1ae9955ffe6143447204114 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Sun, 1 Apr 2012 12:09:55 -0700
Subject: [PATCH] --- yaml --- r: 304787 b: refs/heads/master c:
 6e6ff25bd548a0c5bf5163e4f63e2793dcefbdcb h: refs/heads/master i:   304785:
 aa77c3734110803976983c89764fcbecf58451b4   304783:
 1a85d51dc3ae34ce6656d82445e1ed3f143cc214 v: v3

---
 [refs]                |  2 +-
 trunk/kernel/cgroup.c | 19 +++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 2104aa3344ed..bfcc63e6eb24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e3f6541d45e1a002801e56a19530a90f775deba
+refs/heads/master: 6e6ff25bd548a0c5bf5163e4f63e2793dcefbdcb
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index df8fb82ef350..66c1e3b5c0f2 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -3732,13 +3732,13 @@ static struct cftype files[] = {
 		.read_u64 = cgroup_clone_children_read,
 		.write_u64 = cgroup_clone_children_write,
 	},
-};
-
-static struct cftype cft_release_agent = {
-	.name = "release_agent",
-	.read_seq_string = cgroup_release_agent_show,
-	.write_string = cgroup_release_agent_write,
-	.max_write_len = PATH_MAX,
+	{
+		.name = "release_agent",
+		.flags = CFTYPE_ONLY_ON_ROOT,
+		.read_seq_string = cgroup_release_agent_show,
+		.write_string = cgroup_release_agent_write,
+		.max_write_len = PATH_MAX,
+	},
 };
 
 static int cgroup_populate_dir(struct cgroup *cgrp)
@@ -3750,11 +3750,6 @@ static int cgroup_populate_dir(struct cgroup *cgrp)
 	if (err < 0)
 		return err;
 
-	if (cgrp == cgrp->top_cgroup) {
-		if ((err = cgroup_add_file(cgrp, NULL, &cft_release_agent)) < 0)
-			return err;
-	}
-
 	/* process cftsets of each subsystem */
 	for_each_subsys(cgrp->root, ss) {
 		struct cftype_set *set;