From: Johannes Weiner Date: Thu, 26 May 2011 23:25:35 +0000 (-0700) Subject: memcg: remove unused retry signal from reclaim X-Git-Tag: Ubuntu-5.2.0-15.16~20671 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4fd14ebf6e3b66423dfac2bc9defda7b83ee07b3;p=mirror_ubuntu-eoan-kernel.git memcg: remove unused retry signal from reclaim If the memcg reclaim code detects the target memcg below its limit it exits and returns a guaranteed non-zero value so that the charge is retried. Nowadays, the charge side checks the memcg limit itself and does not rely on this non-zero return value trick. This patch removes it. The reclaim code will now always return the true number of pages it reclaimed on its own. Signed-off-by: Johannes Weiner Acked-by: Rik van Riel Acked-by: Ying Han Acked-by: KAMEZAWA Hiroyuki Reviewed-by: Michal Hocko Cc: Balbir Singh Cc: KOSAKI Motohiro Cc: Mel Gorman Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 1520efd1c7c4..bcb0a0bee1fc 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1596,7 +1596,7 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem, if (!res_counter_soft_limit_excess(&root_mem->res)) return total; } else if (mem_cgroup_margin(root_mem)) - return 1 + total; + return total; } return total; }