Commit 695c6083 authored Jan 02, 2014 by Vladimir Davydov Committed by Linus Torvalds Jan 02, 2014

memcg: fix memcg_size() calculation



The mem_cgroup structure contains nr_node_ids pointers to
mem_cgroup_per_node objects, not the objects themselves.

Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Glauber Costa <glommer@openvz.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 4eb91982

mm/memcontrol.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -338,7 +338,7 @@ struct mem_cgroup {
		static size_t memcg_size(void)
		{
		return sizeof(struct mem_cgroup) +
		nr_node_ids * sizeof(struct mem_cgroup_per_node);
		nr_node_ids * sizeof(struct mem_cgroup_per_node *);
		}

		/* internal only representation about the status of kmem accounting. */