From 6c4605531ad87d6a592e0acf1cc96d29cd9d019c Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Tue, 10 Apr 2012 10:16:36 -0700 Subject: [PATCH] --- yaml --- r: 304800 b: refs/heads/master c: 86f82d561864e902c70282b6f17cf590c0f34691 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/cgroup.h | 1 - trunk/kernel/cgroup.c | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4c83c5e1842d..02ca2f54b8f8 100644 --- 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 index 565c8034e6c8..d3f5fba2c159 100644 --- 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 index 2905977e0f33..b2f203f25ec8 100644 --- 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); }