---

yaml --- r: 284383 b: refs/heads/master c: c3cecc6 h: refs/heads/master i: 284381: 803c320 284379: fc7c1c5 284375: 42b231a 284367: 4e823b0 284351: 80a39ad v: v3
git-mirror · Jan 13, 2012 · 1b86b57 · 1b86b57
1 parent b19b1fe
commit 1b86b57
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fb4b7cc0724f178d4b24a2a566ea1e7cb120b82
+refs/heads/master: c3cecc683446ad54ca587d7123bd3ce94bd7b8e1
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -4960,7 +4960,7 @@ static int mem_cgroup_soft_limit_tree_init(void)
 			tmp = -1;
 		rtpn = kzalloc_node(sizeof(*rtpn), GFP_KERNEL, tmp);
 		if (!rtpn)
-			return 1;
+			goto err_cleanup;
 
 		soft_limit_tree.rb_tree_per_node[node] = rtpn;
 
@@ -4971,6 +4971,16 @@ static int mem_cgroup_soft_limit_tree_init(void)
 		}
 	}
 	return 0;
+
+err_cleanup:
+	for_each_node_state(node, N_POSSIBLE) {
+		if (!soft_limit_tree.rb_tree_per_node[node])
+			break;
+		kfree(soft_limit_tree.rb_tree_per_node[node]);
+		soft_limit_tree.rb_tree_per_node[node] = NULL;
+	}
+	return 1;
+
 }
 
 static struct cgroup_subsys_state * __ref