aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2008-02-23 18:24:14 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-23 20:13:25 -0500
commit2dda81ca31dc73e695ff8b83351f7aaefbef192a (patch)
tree808c6dd9c79f6f62851eb4108c4d7104decc7e9c /mm
parent7fde4c3eb7ee68828d76a2148ed6d70b6a794add (diff)
memcgroup: return negative error code in mem_cgroup_create()
Cgroup requires the subsystem to return negative error code on error in the create method. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Balbir Singh <balbir@in.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index bb4d7acfbca3..631002d085d1 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1100,7 +1100,7 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont)
1100 mem = kzalloc(sizeof(struct mem_cgroup), GFP_KERNEL); 1100 mem = kzalloc(sizeof(struct mem_cgroup), GFP_KERNEL);
1101 1101
1102 if (mem == NULL) 1102 if (mem == NULL)
1103 return NULL; 1103 return ERR_PTR(-ENOMEM);
1104 1104
1105 res_counter_init(&mem->res); 1105 res_counter_init(&mem->res);
1106 1106
@@ -1116,7 +1116,7 @@ free_out:
1116 free_mem_cgroup_per_zone_info(mem, node); 1116 free_mem_cgroup_per_zone_info(mem, node);
1117 if (cont->parent != NULL) 1117 if (cont->parent != NULL)
1118 kfree(mem); 1118 kfree(mem);
1119 return NULL; 1119 return ERR_PTR(-ENOMEM);
1120} 1120}
1121 1121
1122static void mem_cgroup_pre_destroy(struct cgroup_subsys *ss, 1122static void mem_cgroup_pre_destroy(struct cgroup_subsys *ss,