From 792825c1dfe1646043c60a501cc04286346187f3 Mon Sep 17 00:00:00 2001 From: Daisuke Nishimura Date: Wed, 7 Jan 2009 18:08:30 -0800 Subject: [PATCH] --- yaml --- r: 127599 b: refs/heads/master c: 42e9abb628def2c335a4ecf130bb6c88d916d885 h: refs/heads/master i: 127597: 92cb4c591e4aed6e868ae519611673297087435e 127595: cbc63bdb1a3c1ae628b208e4b823d1a24b60b04b 127591: 215e24fc44a6d7ace4bc97a6370af79f22e1146a 127583: 9b29fff0a8cbd95b45d82c5aa83731472849841d v: v3 --- [refs] | 2 +- trunk/mm/memcontrol.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b42eec9e1a69..19d2495d4e42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f4d454dee2e0bdd21bafd413d1c53e443a26540 +refs/heads/master: 42e9abb628def2c335a4ecf130bb6c88d916d885 diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 861037070f66..a7ecf23150c5 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -1430,8 +1430,7 @@ int mem_cgroup_shrink_usage(struct mm_struct *mm, gfp_t gfp_mask) rcu_read_unlock(); do { - progress = try_to_free_mem_cgroup_pages(mem, gfp_mask, true, - get_swappiness(mem)); + progress = mem_cgroup_hierarchical_reclaim(mem, gfp_mask, true); progress += mem_cgroup_check_under_limit(mem); } while (!progress && --retry); @@ -1475,10 +1474,8 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg, if (!ret) break; - progress = try_to_free_mem_cgroup_pages(memcg, - GFP_KERNEL, - false, - get_swappiness(memcg)); + progress = mem_cgroup_hierarchical_reclaim(memcg, GFP_KERNEL, + false); if (!progress) retry_count--; } @@ -1519,8 +1516,7 @@ int mem_cgroup_resize_memsw_limit(struct mem_cgroup *memcg, break; oldusage = res_counter_read_u64(&memcg->memsw, RES_USAGE); - try_to_free_mem_cgroup_pages(memcg, GFP_KERNEL, true, - get_swappiness(memcg)); + mem_cgroup_hierarchical_reclaim(memcg, GFP_KERNEL, true); curusage = res_counter_read_u64(&memcg->memsw, RES_USAGE); if (curusage >= oldusage) retry_count--;