aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@engr.sgi.com>2006-02-01 03:05:29 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-01 08:53:15 -0800
commitc84db23c6e587d3ab00a41c51fedf758e1f6ecd4 (patch)
treef1e31810b14a71ccbb9963e018076212eb267ee9 /mm
parent52a8363eae3872af15880292ff4e06d0fab36986 (diff)
downloadkernel_samsung_aries-c84db23c6e587d3ab00a41c51fedf758e1f6ecd4.zip
kernel_samsung_aries-c84db23c6e587d3ab00a41c51fedf758e1f6ecd4.tar.gz
kernel_samsung_aries-c84db23c6e587d3ab00a41c51fedf758e1f6ecd4.tar.bz2
[PATCH] zone_reclaim: minor fixes
- If we only reclaim nr_pages then its okay to stay on node. Switch from > to >= for the comparison. - vm_table[] entry for zone_reclaim_mode is a bit screwed up. - Add empty lines around shrink_zone to show that this is the central function to be called. Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/vmscan.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c
index a29efb2..61ca009 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1636,14 +1636,16 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
p->flags |= PF_MEMALLOC;
reclaim_state.reclaimed_slab = 0;
p->reclaim_state = &reclaim_state;
+
shrink_zone(zone, &sc);
+
p->reclaim_state = NULL;
current->flags &= ~PF_MEMALLOC;
if (sc.nr_reclaimed == 0)
zone->last_unsuccessful_zone_reclaim = jiffies;
- return sc.nr_reclaimed > nr_pages;
+ return sc.nr_reclaimed >= nr_pages;
}
#endif