---

yaml --- r: 304784 b: refs/heads/master c: ff4c8d5 h: refs/heads/master v: v3
git-mirror · Apr 1, 2012 · 998f929 · 998f929
1 parent 1a85d51
commit 998f929
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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;