]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] zone_reclaim: reclaim on memory only node support
authorChristoph Lameter <clameter@engr.sgi.com>
Wed, 1 Feb 2006 11:05:26 +0000 (03:05 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 16:53:14 +0000 (08:53 -0800)
Zone reclaim is usually only run on the local node.  Headless nodes do not
have any local processors.  This patch checks for headless nodes and
performs zone reclaim on them.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
mm/vmscan.c

index 465bfa54dfd6c8a5298cf48b1d906ec0461beba2..0ca6007d655b5fa04426275472f7a782fc0aab9a 100644 (file)
@@ -1599,17 +1599,23 @@ int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
        struct task_struct *p = current;
        struct reclaim_state reclaim_state;
        struct scan_control sc;
+       cpumask_t mask;
+       int node_id;
 
        if (time_before(jiffies,
                zone->last_unsuccessful_zone_reclaim + ZONE_RECLAIM_INTERVAL))
                        return 0;
 
        if (!(gfp_mask & __GFP_WAIT) ||
-               zone->zone_pgdat->node_id != numa_node_id() ||
                zone->all_unreclaimable ||
                atomic_read(&zone->reclaim_in_progress) > 0)
                        return 0;
 
+       node_id = zone->zone_pgdat->node_id;
+       mask = node_to_cpumask(node_id);
+       if (!cpus_empty(mask) && node_id != numa_node_id())
+               return 0;
+
        sc.may_writepage = 0;
        sc.may_swap = 0;
        sc.nr_scanned = 0;