]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
hugetlb: do not fail in hugetlb_cgroup_pre_destroy
authorMichal Hocko <mhocko@suse.cz>
Fri, 26 Oct 2012 11:37:33 +0000 (13:37 +0200)
committerTejun Heo <tj@kernel.org>
Mon, 5 Nov 2012 17:16:59 +0000 (09:16 -0800)
Now that pre_destroy callbacks are called from the context where neither
any task can attach the group nor any children group can be added there
is no other way to fail from hugetlb_pre_destroy.

Signed-off-by: Michal Hocko <mhocko@suse.cz>
Reviewed-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Glauber Costa <glommer@parallels.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
mm/hugetlb_cgroup.c

index a3f358fb8a0c81bcb7cca5ce7c52c29f002b4261..dc595c6b1f55607939b74b6db1ef57c752431a71 100644 (file)
@@ -159,14 +159,9 @@ static int hugetlb_cgroup_pre_destroy(struct cgroup *cgroup)
 {
        struct hstate *h;
        struct page *page;
-       int ret = 0, idx = 0;
+       int idx = 0;
 
        do {
-               if (cgroup_task_count(cgroup) ||
-                   !list_empty(&cgroup->children)) {
-                       ret = -EBUSY;
-                       goto out;
-               }
                for_each_hstate(h) {
                        spin_lock(&hugetlb_lock);
                        list_for_each_entry(page, &h->hugepage_activelist, lru)
@@ -177,8 +172,8 @@ static int hugetlb_cgroup_pre_destroy(struct cgroup *cgroup)
                }
                cond_resched();
        } while (hugetlb_cgroup_have_usage(cgroup));
-out:
-       return ret;
+
+       return 0;
 }
 
 int hugetlb_cgroup_charge_cgroup(int idx, unsigned long nr_pages,