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

Commit d845aa2c authored by Kamezawa Hiroyuki's avatar Kamezawa Hiroyuki Committed by Linus Torvalds
Browse files

memcg: clean up force_empty_list() return value check 



After bf544fdc241da8 "memcg: move charges to root cgroup if
use_hierarchy=0 in mem_cgroup_move_hugetlb_parent()"
mem_cgroup_move_parent() returns only -EBUSY or -EINVAL.  So we can remove
the -ENOMEM and -EINTR checks.

Signed-off-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 59b8e85c

mm/memcontrol.c

+0 −5
Original line number Diff line number Diff line
@@ -3653,8 +3653,6 @@ static int mem_cgroup_force_empty_list(struct mem_cgroup *memcg, 
		pc = lookup_page_cgroup(page);



		ret = mem_cgroup_move_parent(page, pc, memcg, GFP_KERNEL);

		if (ret == -ENOMEM || ret == -EINTR)

			break;



		if (ret == -EBUSY || ret == -EINVAL) {

			/* found lock contention or "pc" is obsolete. */
@@ -3711,9 +3709,6 @@ static int mem_cgroup_force_empty(struct mem_cgroup *memcg, bool free_all) 
		}

		mem_cgroup_end_move(memcg);

		memcg_oom_recover(memcg);

		/* it seems parent cgroup doesn't have enough mem */

		if (ret == -ENOMEM)

			goto try_to_free;

		cond_resched();

	/* "ret" should also be checked to ensure all lists are empty. */

	} while (res_counter_read_u64(&memcg->res, RES_USAGE) > 0 || ret);