forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cgroup: make ->pre_destroy() return void

Browse source 
All ->pre_destory() implementations return 0 now, which is the only
allowed return value.  Make it return void.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Li Zefan <lizefan@huawei.com>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
Tejun Heo 2012-11-05 09:16:59 -08:00
commit bcf6de1b91
5 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
block/blk-cgroup.c
View file

@ -600,7 +600,7 @@ struct cftype blkcg_files[] = {
* *
* This is the blkcg counterpart of ioc_release_fn(). * This is the blkcg counterpart of ioc_release_fn().
*/ */
static int blkcg_pre_destroy(struct cgroup *cgroup) static void blkcg_pre_destroy(struct cgroup *cgroup)
{ {
struct blkcg *blkcg = cgroup_to_blkcg(cgroup); struct blkcg *blkcg = cgroup_to_blkcg(cgroup);
@ -622,7 +622,6 @@ static int blkcg_pre_destroy(struct cgroup *cgroup)
} }
spin_unlock_irq(&blkcg->lock); spin_unlock_irq(&blkcg->lock);
return 0;
} }
static void blkcg_destroy(struct cgroup *cgroup) static void blkcg_destroy(struct cgroup *cgroup)

2
include/linux/cgroup.h
View file

@ -436,7 +436,7 @@ int cgroup_taskset_size(struct cgroup_taskset *tset);
struct cgroup_subsys { struct cgroup_subsys {
struct cgroup_subsys_state *(*create)(struct cgroup *cgrp); struct cgroup_subsys_state *(*create)(struct cgroup *cgrp);
int (*pre_destroy)(struct cgroup *cgrp); void (*pre_destroy)(struct cgroup *cgrp);
void (*destroy)(struct cgroup *cgrp); void (*destroy)(struct cgroup *cgrp);
int (*can_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset); int (*can_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset);
void (*cancel_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset); void (*cancel_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset);

2
kernel/cgroup.c
View file

@ -4054,7 +4054,7 @@ static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry)
mutex_unlock(&cgroup_mutex); mutex_unlock(&cgroup_mutex);
for_each_subsys(cgrp->root, ss) for_each_subsys(cgrp->root, ss)
if (ss->pre_destroy) if (ss->pre_destroy)
WARN_ON_ONCE(ss->pre_destroy(cgrp)); ss->pre_destroy(cgrp);
mutex_lock(&cgroup_mutex); mutex_lock(&cgroup_mutex);
/* /*

4
mm/hugetlb_cgroup.c
View file

@ -155,7 +155,7 @@ out:
* Force the hugetlb cgroup to empty the hugetlb resources by moving them to * Force the hugetlb cgroup to empty the hugetlb resources by moving them to
* the parent cgroup. * the parent cgroup.
*/ */
static int hugetlb_cgroup_pre_destroy(struct cgroup *cgroup) static void hugetlb_cgroup_pre_destroy(struct cgroup *cgroup)
{ {
struct hstate *h; struct hstate *h;
struct page *page; struct page *page;
@ -172,8 +172,6 @@ static int hugetlb_cgroup_pre_destroy(struct cgroup *cgroup)
} }
cond_resched(); cond_resched();
} while (hugetlb_cgroup_have_usage(cgroup)); } while (hugetlb_cgroup_have_usage(cgroup));
return 0;
} }
int hugetlb_cgroup_charge_cgroup(int idx, unsigned long nr_pages, int hugetlb_cgroup_charge_cgroup(int idx, unsigned long nr_pages,

3
mm/memcontrol.c
View file

@ -5002,12 +5002,11 @@ free_out:
return ERR_PTR(error); return ERR_PTR(error);
} }
static int mem_cgroup_pre_destroy(struct cgroup *cont) static void mem_cgroup_pre_destroy(struct cgroup *cont)
{ {
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
mem_cgroup_reparent_charges(memcg); mem_cgroup_reparent_charges(memcg);
return 0;
} }
static void mem_cgroup_destroy(struct cgroup *cont) static void mem_cgroup_destroy(struct cgroup *cont)