Commit bcf6de1b authored by Tejun Heo's avatar Tejun Heo
Browse files

cgroup: make ->pre_destroy() return void 



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

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarMichal Hocko <mhocko@suse.cz>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarLi Zefan <lizefan@huawei.com>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
parent 9d093cb1

block/blk-cgroup.c

+1 −2
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ struct cftype blkcg_files[] = { 
 *

 * 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);
@@ -622,7 +622,6 @@ static int blkcg_pre_destroy(struct cgroup *cgroup) 
	}



	spin_unlock_irq(&blkcg->lock);

	return 0;

}



static void blkcg_destroy(struct cgroup *cgroup)

include/linux/cgroup.h

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ int cgroup_taskset_size(struct cgroup_taskset *tset); 


struct cgroup_subsys {

	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);

	int (*can_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset);

	void (*cancel_attach)(struct cgroup *cgrp, struct cgroup_taskset *tset);

kernel/cgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -4054,7 +4054,7 @@ static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry) 
	mutex_unlock(&cgroup_mutex);

	for_each_subsys(cgrp->root, ss)

		if (ss->pre_destroy)

			WARN_ON_ONCE(ss->pre_destroy(cgrp));

			ss->pre_destroy(cgrp);

	mutex_lock(&cgroup_mutex);



	/*

mm/hugetlb_cgroup.c

+1 −3
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ out: 
 * Force the hugetlb cgroup to empty the hugetlb resources by moving them to

 * 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 page *page;
@@ -172,8 +172,6 @@ static int hugetlb_cgroup_pre_destroy(struct cgroup *cgroup) 
		}

		cond_resched();

	} while (hugetlb_cgroup_have_usage(cgroup));



	return 0;

}



int hugetlb_cgroup_charge_cgroup(int idx, unsigned long nr_pages,

mm/memcontrol.c

+1 −2
Original line number Diff line number Diff line
@@ -5002,12 +5002,11 @@ free_out: 
	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);



	mem_cgroup_reparent_charges(memcg);

	return 0;

}



static void mem_cgroup_destroy(struct cgroup *cont)

CRA Git | Maintained and supported by SUSTech CRA and CCSE