Thread (7 messages) 7 messages, 3 authors, 2013-02-13

Re: [PATCH 1/2] memcg: fast hierarchy-aware child test fix

From: Kamezawa Hiroyuki <hidden>
Date: 2013-02-13 10:42:40
Also in: linux-mm

(2013/02/11 17:04), Glauber Costa wrote:
quoted hunk ↗ jump to hunk
---
  mm/memcontrol.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 25ac5f4..28252c9 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5883,8 +5883,7 @@ static int mem_cgroup_oom_control_write(struct cgroup *cgrp,
  
  	mutex_lock(&memcg_create_mutex);
  	/* oom-kill-disable is a flag for subhierarchy. */
-	if ((parent->use_hierarchy) ||
-	    (memcg->use_hierarchy && !list_empty(&cgrp->children))) {
+	if ((parent->use_hierarchy) || memcg_has_children(memcg)) {
  		cgroup_unlock();
  		return -EINVAL;
  	}
Acked-by: KAMEZAWA Hiroyuki <redacted>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help