Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2dda81ca authored by Li Zefan's avatar Li Zefan Committed by Linus Torvalds
Browse files

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: default avatarLi Zefan <lizf@cn.fujitsu.com>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarBalbir Singh <balbir@in.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7fde4c3e

mm/memcontrol.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1100,7 +1100,7 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont) 
		mem = kzalloc(sizeof(struct mem_cgroup), GFP_KERNEL);

		mem = kzalloc(sizeof(struct mem_cgroup), GFP_KERNEL);





	if (mem == NULL)

	if (mem == NULL)

		return NULL;

		return ERR_PTR(-ENOMEM);





	res_counter_init(&mem->res);

	res_counter_init(&mem->res);
@@ -1116,7 +1116,7 @@ free_out: 
		free_mem_cgroup_per_zone_info(mem, node);

		free_mem_cgroup_per_zone_info(mem, node);

	if (cont->parent != NULL)

	if (cont->parent != NULL)

		kfree(mem);

		kfree(mem);

	return NULL;

	return ERR_PTR(-ENOMEM);

}

}





static void mem_cgroup_pre_destroy(struct cgroup_subsys *ss,

static void mem_cgroup_pre_destroy(struct cgroup_subsys *ss,