From 998f92918e7ab01b30c0e4dca32d0c59c7db70a0 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Sun, 1 Apr 2012 12:09:54 -0700
Subject: [PATCH] --- yaml --- r: 304784 b: refs/heads/master c:
 ff4c8d503e2583b485da46d0ec3dcc29639ab889 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3e1ee5fcb865..947f7c8a5215 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b5a5a9dbca914d1f7d70276024d1525a3c94081
+refs/heads/master: ff4c8d503e2583b485da46d0ec3dcc29639ab889
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index 741c120e06c1..8f72853131d3 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -1313,7 +1313,8 @@ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
 		goto out_unlock;
 	}
 
-	/* (re)populate subsystem files */
+	/* clear out any existing files and repopulate subsystem files */
+	cgroup_clear_directory(cgrp->dentry);
 	cgroup_populate_dir(cgrp);
 
 	if (opts.release_agent)
@@ -3644,9 +3645,6 @@ static int cgroup_populate_dir(struct cgroup *cgrp)
 	int err;
 	struct cgroup_subsys *ss;
 
-	/* First clear out any existing files */
-	cgroup_clear_directory(cgrp->dentry);
-
 	err = cgroup_add_files(cgrp, NULL, files, ARRAY_SIZE(files));
 	if (err < 0)
 		return err;