forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

revert "vmscan, memcg: do softlimit reclaim also for targeted reclaim"

Browse source 
Revert commit a5b7c87f92 ("vmscan, memcg: do softlimit reclaim also
for targeted reclaim")

I merged this prematurely - Michal and Johannes still disagree about the
overall design direction and the future remains unclear.

Cc: Michal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2013-09-24 15:27:38 -07:00 • committed by Linus Torvalds
parent 694fbc0fe7
commit b1aff7fcf8
3 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mm/vmscan.c
View file

@ -142,7 +142,7 @@ static bool global_reclaim(struct scan_control *sc)
static bool mem_cgroup_should_soft_reclaim(struct scan_control *sc)
{
return !mem_cgroup_disabled();
return !mem_cgroup_disabled() && global_reclaim(sc);
}
#else
static bool global_reclaim(struct scan_control *sc)
@ -2195,7 +2195,7 @@ __shrink_zone(struct zone *zone, struct scan_control *sc, bool soft_reclaim)
struct lruvec *lruvec;
if (soft_reclaim &&
!mem_cgroup_soft_reclaim_eligible(memcg, root)) {
!mem_cgroup_soft_reclaim_eligible(memcg)) {
memcg = mem_cgroup_iter(root, memcg, &reclaim);
continue;
}