[PATCH for-3.5] cgroup: remove cgroup_subsys->populate()

[PATCH for-3.5] cgroup: remove cgroup_subsys->populate()

[Tejun Heo]

With memcg converted, cgroup_subsys->populate() doesn't have any user
left.  Remove it.

Signed-off-by: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
Li, can you please ack this?  Thanks.

 include/linux/cgroup.h |    1 -
 kernel/cgroup.c        |    3 ---
 2 files changed, 4 deletions(-)

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 565c803..d3f5fba 100644
--- a/include/linux/cgroup.h
+++ b/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/kernel/cgroup.c b/kernel/cgroup.c
index 2905977..b2f203f 100644
--- a/kernel/cgroup.c
+++ b/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);
 	}

Re: [PATCH for-3.5] cgroup: remove cgroup_subsys->populate()

[Li Zefan]

Tejun Heo wrote:

> With memcg converted, cgroup_subsys->populate() doesn't have any user
> left.  Remove it.
> 
> Signed-off-by: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> ---
> Li, can you please ack this?  Thanks.


You forgot to update Documentation/cgroups/cgroups.txt. ;)

And with that:

Acked-by: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>

> 
>  include/linux/cgroup.h |    1 -
>  kernel/cgroup.c        |    3 ---
>  2 files changed, 4 deletions(-)
> 
> diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
> index 565c803..d3f5fba 100644
> --- a/include/linux/cgroup.h
> +++ b/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/kernel/cgroup.c b/kernel/cgroup.c
> index 2905977..b2f203f 100644
> --- a/kernel/cgroup.c
> +++ b/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);
>  	}

Re: [PATCH for-3.5] cgroup: remove cgroup_subsys->populate()

[Tejun Heo]

On Wed, Apr 11, 2012 at 08:40:27AM +0800, Li Zefan wrote:
> Tejun Heo wrote:
> 
> > With memcg converted, cgroup_subsys->populate() doesn't have any user
> > left.  Remove it.
> > 
> > Signed-off-by: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> > ---
> > Li, can you please ack this?  Thanks.
> 
> 
> You forgot to update Documentation/cgroups/cgroups.txt. ;)

Yeah, the doc is getting out of sync (->cftypes update is missing
too).  I'll get to it later.

> And with that:
> 
> Acked-by: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>

Thanks.

-- 
tejun

Re: [PATCH for-3.5] cgroup: remove cgroup_subsys->populate()

[Tejun Heo]

On Wed, Apr 11, 2012 at 08:40:27AM +0800, Li Zefan wrote:
> Tejun Heo wrote:
> 
> > With memcg converted, cgroup_subsys->populate() doesn't have any user
> > left.  Remove it.
> > 
> > Signed-off-by: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> > ---
> > Li, can you please ack this?  Thanks.
> 
> 
> You forgot to update Documentation/cgroups/cgroups.txt. ;)

Yeah, the doc is getting out of sync (->cftypes update is missing
too).  I'll get to it later.

> And with that:
> 
> Acked-by: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>

Thanks.

-- 
tejun

[PATCH for-3.5] cgroup: remove cgroup_subsys->populate()

[Tejun Heo]

With memcg converted, cgroup_subsys->populate() doesn't have any user
left.  Remove it.

Signed-off-by: Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
Li, can you please ack this?  Thanks.

 include/linux/cgroup.h |    1 -
 kernel/cgroup.c        |    3 ---
 2 files changed, 4 deletions(-)

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 565c803..d3f5fba 100644
--- a/include/linux/cgroup.h
+++ b/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/kernel/cgroup.c b/kernel/cgroup.c
index 2905977..b2f203f 100644
--- a/kernel/cgroup.c
+++ b/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);
 	}