1 files changed, 20 insertions, 105 deletions

diff --git a/mm/vmscan.c b/mm/vmscan.c
index b0cd81c32de6..be8235fb1939 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -63,9 +63,6 @@ struct scan_control {
 
         unsigned long nr_mapped;        /* From page_state */
 
-        /* How many pages shrink_cache() should reclaim */
-        int nr_to_reclaim;
-
         /* Ask shrink_caches, or shrink_zone to scan at this priority */
         unsigned int priority;
 
@@ -74,9 +71,6 @@ struct scan_control {
 
         int may_writepage;
 
-        /* Can pages be swapped as part of reclaim? */
-        int may_swap;
-
         /* This context's SWAP_CLUSTER_MAX. If freeing memory for
          * suspend, we effectively ignore SWAP_CLUSTER_MAX.
          * In this context, it doesn't matter that we scan the
@@ -367,7 +361,7 @@ static pageout_t pageout(struct page *page, struct address_space *mapping)
                 res = mapping->a_ops->writepage(page, &wbc);
                 if (res < 0)
                         handle_write_error(mapping, page, res);
-                if (res == WRITEPAGE_ACTIVATE) {
+                if (res == AOP_WRITEPAGE_ACTIVATE) {
                         ClearPageReclaim(page);
                         return PAGE_ACTIVATE;
                 }
@@ -430,8 +424,6 @@ static int shrink_list(struct list_head *page_list, struct scan_control *sc)
                  * Try to allocate it some swap space here.
                  */
                 if (PageAnon(page) && !PageSwapCache(page)) {
-                        if (!sc->may_swap)
-                                goto keep_locked;
                         if (!add_to_swap(page))
                                 goto activate_locked;
                 }
@@ -653,17 +645,17 @@ static void shrink_cache(struct zone *zone, struct scan_control *sc)
                         goto done;
 
                 max_scan -= nr_scan;
-                if (current_is_kswapd())
-                        mod_page_state_zone(zone, pgscan_kswapd, nr_scan);
-                else
-                        mod_page_state_zone(zone, pgscan_direct, nr_scan);
                 nr_freed = shrink_list(&page_list, sc);
-                if (current_is_kswapd())
-                        mod_page_state(kswapd_steal, nr_freed);
-                mod_page_state_zone(zone, pgsteal, nr_freed);
-                sc->nr_to_reclaim -= nr_freed;
 
-                spin_lock_irq(&zone->lru_lock);
+                local_irq_disable();
+                if (current_is_kswapd()) {
+                        __mod_page_state_zone(zone, pgscan_kswapd, nr_scan);
+                        __mod_page_state(kswapd_steal, nr_freed);
+                } else
+                        __mod_page_state_zone(zone, pgscan_direct, nr_scan);
+                __mod_page_state_zone(zone, pgsteal, nr_freed);
+
+                spin_lock(&zone->lru_lock);
                 /*
                  * Put back any unfreeable pages.
                  */
@@ -825,11 +817,13 @@ refill_inactive_zone(struct zone *zone, struct scan_control *sc)
                 }
         }
         zone->nr_active += pgmoved;
-        spin_unlock_irq(&zone->lru_lock);
-        pagevec_release(&pvec);
+        spin_unlock(&zone->lru_lock);
+
+        __mod_page_state_zone(zone, pgrefill, pgscanned);
+        __mod_page_state(pgdeactivate, pgdeactivate);
+        local_irq_enable();
 
-        mod_page_state_zone(zone, pgrefill, pgscanned);
-        mod_page_state(pgdeactivate, pgdeactivate);
+        pagevec_release(&pvec);
 }
 
 /*
@@ -861,8 +855,6 @@ shrink_zone(struct zone *zone, struct scan_control *sc)
         else
                 nr_inactive = 0;
 
-        sc->nr_to_reclaim = sc->swap_cluster_max;
-
         while (nr_active || nr_inactive) {
                 if (nr_active) {
                         sc->nr_to_scan = min(nr_active,
@@ -876,8 +868,6 @@ shrink_zone(struct zone *zone, struct scan_control *sc)
                                         (unsigned long)sc->swap_cluster_max);
                         nr_inactive -= sc->nr_to_scan;
                         shrink_cache(zone, sc);
-                        if (sc->nr_to_reclaim <= 0)
-                                break;
                 }
         }
 
@@ -910,7 +900,7 @@ shrink_caches(struct zone **zones, struct scan_control *sc)
         for (i = 0; zones[i] != NULL; i++) {
                 struct zone *zone = zones[i];
 
-                if (zone->present_pages == 0)
+                if (!populated_zone(zone))
                         continue;
 
                 if (!cpuset_zone_allowed(zone, __GFP_HARDWALL))
@@ -952,7 +942,6 @@ int try_to_free_pages(struct zone **zones, gfp_t gfp_mask)
 
         sc.gfp_mask = gfp_mask;
         sc.may_writepage = 0;
-        sc.may_swap = 1;
 
         inc_page_state(allocstall);
 
@@ -1055,7 +1044,6 @@ loop_again:
         total_reclaimed = 0;
         sc.gfp_mask = GFP_KERNEL;
         sc.may_writepage = 0;
-        sc.may_swap = 1;
         sc.nr_mapped = read_page_state(nr_mapped);
 
         inc_page_state(pageoutrun);
@@ -1084,7 +1072,7 @@ loop_again:
                         for (i = pgdat->nr_zones - 1; i >= 0; i--) {
                                 struct zone *zone = pgdat->node_zones + i;
 
-                                if (zone->present_pages == 0)
+                                if (!populated_zone(zone))
                                         continue;
 
                                 if (zone->all_unreclaimable &&
@@ -1121,7 +1109,7 @@ scan:
                         struct zone *zone = pgdat->node_zones + i;
                         int nr_slab;
 
-                        if (zone->present_pages == 0)
+                        if (!populated_zone(zone))
                                 continue;
 
                         if (zone->all_unreclaimable && priority != DEF_PRIORITY)
@@ -1273,7 +1261,7 @@ void wakeup_kswapd(struct zone *zone, int order)
 {
         pg_data_t *pgdat;
 
-        if (zone->present_pages == 0)
+        if (!populated_zone(zone))
                 return;
 
         pgdat = zone->zone_pgdat;
@@ -1353,76 +1341,3 @@ static int __init kswapd_init(void)
 }
 
 module_init(kswapd_init)
-
-
-/*
- * Try to free up some pages from this zone through reclaim.
- */
-int zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
-{
-        struct scan_control sc;
-        int nr_pages = 1 << order;
-        int total_reclaimed = 0;
-
-        /* The reclaim may sleep, so don't do it if sleep isn't allowed */
-        if (!(gfp_mask & __GFP_WAIT))
-                return 0;
-        if (zone->all_unreclaimable)
-                return 0;
-
-        sc.gfp_mask = gfp_mask;
-        sc.may_writepage = 0;
-        sc.may_swap = 0;
-        sc.nr_mapped = read_page_state(nr_mapped);
-        sc.nr_scanned = 0;
-        sc.nr_reclaimed = 0;
-        /* scan at the highest priority */
-        sc.priority = 0;
-        disable_swap_token();
-
-        if (nr_pages > SWAP_CLUSTER_MAX)
-                sc.swap_cluster_max = nr_pages;
-        else
-                sc.swap_cluster_max = SWAP_CLUSTER_MAX;
-
-        /* Don't reclaim the zone if there are other reclaimers active */
-        if (atomic_read(&zone->reclaim_in_progress) > 0)
-                goto out;
-
-        shrink_zone(zone, &sc);
-        total_reclaimed = sc.nr_reclaimed;
-
- out:
-        return total_reclaimed;
-}
-
-asmlinkage long sys_set_zone_reclaim(unsigned int node, unsigned int zone,
-                                     unsigned int state)
-{
-        struct zone *z;
-        int i;
-
-        if (!capable(CAP_SYS_ADMIN))
-                return -EACCES;
-
-        if (node >= MAX_NUMNODES || !node_online(node))
-                return -EINVAL;
-
-        /* This will break if we ever add more zones */
-        if (!(zone & (1<<ZONE_DMA|1<<ZONE_NORMAL|1<<ZONE_HIGHMEM)))
-                return -EINVAL;
-
-        for (i = 0; i < MAX_NR_ZONES; i++) {
-                if (!(zone & 1<<i))
-                        continue;
-
-                z = &NODE_DATA(node)->node_zones[i];
-
-                if (state)
-                        z->reclaim_pages = 1;
-                else
-                        z->reclaim_pages = 0;
-        }
-
-        return 0;
-}