---

yaml --- r: 339363 b: refs/heads/master c: 7083d03 h: refs/heads/master i: 339361: 7e826d2 339359: 674ebc6 v: v3
git-mirror · Dec 3, 2012 · f98f428 · f98f428
1 parent 854b1fa
commit f98f428
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 879a3d9dbbde823ac77d39131e7a287f31b8296f
+refs/heads/master: 7083d0378a1746f2b45729cae494c6b92e75d73f
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
@@ -1349,14 +1349,21 @@ static int cgroup_remount(struct super_block *sb, int *flags, char *data)
 		goto out_unlock;
 	}
 
+	/*
+	 * Clear out the files of subsystems that should be removed, do
+	 * this before rebind_subsystems, since rebind_subsystems may
+	 * change this hierarchy's subsys_list.
+	 */
+	cgroup_clear_directory(cgrp->dentry, false, removed_mask);
+
 	ret = rebind_subsystems(root, opts.subsys_mask);
 	if (ret) {
+		/* rebind_subsystems failed, re-populate the removed files */
+		cgroup_populate_dir(cgrp, false, removed_mask);
 		drop_parsed_module_refcounts(opts.subsys_mask);
 		goto out_unlock;
 	}
 
-	/* clear out any existing files and repopulate subsystem files */
-	cgroup_clear_directory(cgrp->dentry, false, removed_mask);
 	/* re-populate subsystem files */
 	cgroup_populate_dir(cgrp, false, added_mask);