---

yaml --- r: 304800 b: refs/heads/master c: 86f82d5 h: refs/heads/master v: v3
git-mirror · Apr 11, 2012 · 6c46055 · 6c46055
1 parent 991e46a
commit 6c46055
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbe128e348e5994516304f94865ff90c40c1c5ae
+refs/heads/master: 86f82d561864e902c70282b6f17cf590c0f34691
diff --git a/trunk/include/linux/cgroup.h b/trunk/include/linux/cgroup.h
@@ -472,7 +472,6 @@ struct cgroup_subsys {
 	void (*fork)(struct task_struct *task);
 	void (*exit)(struct cgroup *cgrp, struct cgroup *old_cgrp,
 		     struct task_struct *task);
-	int (*populate)(struct cgroup_subsys *ss, struct cgroup *cgrp);
 	void (*post_clone)(struct cgroup *cgrp);
 	void (*bind)(struct cgroup *root);
 

diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
@@ -3842,9 +3842,6 @@ static int cgroup_populate_dir(struct cgroup *cgrp)
 	for_each_subsys(cgrp->root, ss) {
 		struct cftype_set *set;
 
-		if (ss->populate && (err = ss->populate(ss, cgrp)) < 0)
-			return err;
-
 		list_for_each_entry(set, &ss->cftsets, node)
 			cgroup_addrm_files(cgrp, ss, set->cfts, true);
 	}