[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>

diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index cb99a42f8b37c60e991332ce33b4fba1dacb9dc6..c74f03bc01445a2f57eae5f8ea53b8e5965af0fb 100644 (file)
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -878,7 +878,8 @@ static ctl_table vm_table[] = {
                .maxlen         = sizeof(zone_reclaim_mode),
                .mode           = 0644,
                .proc_handler   = &proc_dointvec,
-               .strategy       = &zero,
+               .strategy       = &sysctl_intvec,
+               .extra1         = &zero,
        },
 #endif
        { .ctl_name = 0 }

diff --git a/mm/vmscan.c b/mm/vmscan.c
index a29efb2c06c831145d0ebf279c94423fb7348253..61ca0097c8343b4292bd6feb92660bc2870096de 100644 (file)
--- 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