[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAJd=RBB_AoJmyPd7gfHn+Kk39cn-+Wn-pFvU0ZWRZhw2fxoihw@mail.gmail.com>
Date: Sun, 11 Dec 2011 09:19:12 +0800
From: Hillf Danton <dhillf@...il.com>
To: Balbir Singh <bsingharora@...il.com>
Cc: David Rientjes <rientjes@...gle.com>,
Hugh Dickins <hughd@...gle.com>,
Andrea Arcangeli <aarcange@...hat.com>,
Andrew Morton <akpm@...ux-foundation.org>, linux-mm@...ck.org,
LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] mm: memcg: keep root group unchanged if fail to create new
If the request is not to create root group and we fail to meet it, we'd leave
the root unchanged.
Signed-off-by: Hillf Danton <dhillf@...il.com>
---
--- a/mm/memcontrol.c Fri Dec 9 21:57:40 2011
+++ b/mm/memcontrol.c Sun Dec 11 09:04:48 2011
@@ -4849,8 +4849,10 @@ mem_cgroup_create(struct cgroup_subsys *
enable_swap_cgroup();
parent = NULL;
root_mem_cgroup = memcg;
- if (mem_cgroup_soft_limit_tree_init())
+ if (mem_cgroup_soft_limit_tree_init()) {
+ root_mem_cgroup = NULL;
goto free_out;
+ }
for_each_possible_cpu(cpu) {
struct memcg_stock_pcp *stock =
&per_cpu(memcg_stock, cpu);
@@ -4888,7 +4890,6 @@ mem_cgroup_create(struct cgroup_subsys *
return &memcg->css;
free_out:
__mem_cgroup_free(memcg);
- root_mem_cgroup = NULL;
return ERR_PTR(error);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists