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

Commit 3ed28fa1 authored by Bob Liu's avatar Bob Liu Committed by Linus Torvalds
Browse files

memcg: cleanup for_each_node_state() 



We already have for_each_node(node) define in nodemask.h, better to use it.

Signed-off-by: default avatarBob Liu <lliubbo@gmail.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 38c5d72f

mm/memcontrol.c

+5 −5
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static void mem_cgroup_remove_from_trees(struct mem_cgroup *memcg) 
	struct mem_cgroup_per_zone *mz;

	struct mem_cgroup_tree_per_zone *mctz;



	for_each_node_state(node, N_POSSIBLE) {

	for_each_node(node) {

		for (zone = 0; zone < MAX_NR_ZONES; zone++) {

			mz = mem_cgroup_zoneinfo(memcg, node, zone);

			mctz = soft_limit_tree_node_zone(node, zone);
@@ -4818,7 +4818,7 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg) 
	mem_cgroup_remove_from_trees(memcg);

	free_css_id(&mem_cgroup_subsys, &memcg->css);



	for_each_node_state(node, N_POSSIBLE)

	for_each_node(node)

		free_mem_cgroup_per_zone_info(memcg, node);



	free_percpu(memcg->stat);
@@ -4877,7 +4877,7 @@ static int mem_cgroup_soft_limit_tree_init(void) 
	struct mem_cgroup_tree_per_zone *rtpz;

	int tmp, node, zone;



	for_each_node_state(node, N_POSSIBLE) {

	for_each_node(node) {

		tmp = node;

		if (!node_state(node, N_NORMAL_MEMORY))

			tmp = -1;
@@ -4896,7 +4896,7 @@ static int mem_cgroup_soft_limit_tree_init(void) 
	return 0;



err_cleanup:

	for_each_node_state(node, N_POSSIBLE) {

	for_each_node(node) {

		if (!soft_limit_tree.rb_tree_per_node[node])

			break;

		kfree(soft_limit_tree.rb_tree_per_node[node]);
@@ -4917,7 +4917,7 @@ mem_cgroup_create(struct cgroup_subsys *ss, struct cgroup *cont) 
	if (!memcg)

		return ERR_PTR(error);



	for_each_node_state(node, N_POSSIBLE)

	for_each_node(node)

		if (alloc_mem_cgroup_per_zone_info(memcg, node))

			goto free_out;