X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=mm%2Fmemcontrol.c;h=2efa8ea07ff7d931577da964c190f5524088da3d;hb=b382b191ea9e9ccefc437433d23befe91f4a8925;hp=9a99cfaf0a19025f6020c106d56e1ce28d6499b4;hpb=9ae6d039224def926656206725ae6e89d1331417;p=net-next-2.6.git

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 9a99cfaf0a1..2efa8ea07ff 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4208,15 +4208,17 @@ static struct mem_cgroup *mem_cgroup_alloc(void)
 
 	memset(mem, 0, size);
 	mem->stat = alloc_percpu(struct mem_cgroup_stat_cpu);
-	if (!mem->stat) {
-		if (size < PAGE_SIZE)
-			kfree(mem);
-		else
-			vfree(mem);
-		mem = NULL;
-	}
+	if (!mem->stat)
+		goto out_free;
 	spin_lock_init(&mem->pcp_counter_lock);
 	return mem;
+
+out_free:
+	if (size < PAGE_SIZE)
+		kfree(mem);
+	else
+		vfree(mem);
+	return NULL;
 }
 
 /*