memcg: fix memcg_size() calculation

Vladimir Davydov · torvalds · commit 695c60830764 · 2014-01-02T14:40:30.000-08:00
The mem_cgroup structure contains nr_node_ids pointers to
mem_cgroup_per_node objects, not the objects themselves.

Signed-off-by: Vladimir Davydov &lt;vdavydov@parallels.com&gt;
Acked-by: Michal Hocko &lt;mhocko@suse.cz&gt;
Cc: Glauber Costa &lt;glommer@openvz.org&gt;
Cc: Johannes Weiner &lt;hannes@cmpxchg.org&gt;
Cc: Balbir Singh &lt;bsingharora@gmail.com&gt;
Cc: KAMEZAWA Hiroyuki &lt;kamezawa.hiroyu@jp.fujitsu.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
@@ -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. */

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ struct mem_cgroup {`
`338`	`338`	`static size_t memcg_size(void)`
`339`	`339`	`{`
`340`	`340`	`return sizeof(struct mem_cgroup) +`
`341`		`- nr_node_ids * sizeof(struct mem_cgroup_per_node);`
	`341`	`+ nr_node_ids * sizeof(struct mem_cgroup_per_node *);`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`/* internal only representation about the status of kmem accounting. */`