1 files changed, 17 insertions, 6 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index d315e1127dc9..43f757fcf30f 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -27,6 +27,7 @@
 #include <linux/pagevec.h>
 #include <linux/blkdev.h>
 #include <linux/slab.h>
+#include <linux/oom.h>
 #include <linux/notifier.h>
 #include <linux/topology.h>
 #include <linux/sysctl.h>
@@ -489,7 +490,7 @@ static void free_pages_bulk(struct zone *zone, int count,
                                         struct list_head *list, int order)
 {
         spin_lock(&zone->lock);
-        zone->all_unreclaimable = 0;
+        zone_clear_flag(zone, ZONE_ALL_UNRECLAIMABLE);
         zone->pages_scanned = 0;
         while (count--) {
                 struct page *page;
@@ -506,7 +507,7 @@ static void free_pages_bulk(struct zone *zone, int count,
 static void free_one_page(struct zone *zone, struct page *page, int order)
 {
         spin_lock(&zone->lock);
-        zone->all_unreclaimable = 0;
+        zone_clear_flag(zone, ZONE_ALL_UNRECLAIMABLE);
         zone->pages_scanned = 0;
         __free_one_page(page, zone, order);
         spin_unlock(&zone->lock);
@@ -1586,6 +1587,11 @@ nofail_alloc:
                 if (page)
                         goto got_pg;
         } else if ((gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY)) {
+                if (!try_set_zone_oom(zonelist)) {
+                        schedule_timeout_uninterruptible(1);
+                        goto restart;
+                }
+
                 /*
                  * Go through the zonelist yet one more time, keep
                  * very high watermark here, this is only to catch
@@ -1594,14 +1600,19 @@ nofail_alloc:
                  */
                 page = get_page_from_freelist(gfp_mask|__GFP_HARDWALL, order,
                                 zonelist, ALLOC_WMARK_HIGH|ALLOC_CPUSET);
-                if (page)
+                if (page) {
+                        clear_zonelist_oom(zonelist);
                         goto got_pg;
+                }
 
                 /* The OOM killer will not help higher order allocs so fail */
-                if (order > PAGE_ALLOC_COSTLY_ORDER)
+                if (order > PAGE_ALLOC_COSTLY_ORDER) {
+                        clear_zonelist_oom(zonelist);
                         goto nopage;
+                }
 
                 out_of_memory(zonelist, gfp_mask, order);
+                clear_zonelist_oom(zonelist);
                 goto restart;
         }
 
@@ -1850,7 +1861,7 @@ void show_free_areas(void)
                         K(zone_page_state(zone, NR_INACTIVE)),
                         K(zone->present_pages),
                         zone->pages_scanned,
-                        (zone->all_unreclaimable ? "yes" : "no")
+                        (zone_is_all_unreclaimable(zone) ? "yes" : "no")
                         );
                 printk("lowmem_reserve[]:");
                 for (i = 0; i < MAX_NR_ZONES; i++)
@@ -3371,7 +3382,7 @@ static void __meminit free_area_init_core(struct pglist_data *pgdat,
                 zone->nr_scan_active = 0;
                 zone->nr_scan_inactive = 0;
                 zap_zone_vm_stats(zone);
-                atomic_set(&zone->reclaim_in_progress, 0);
+                zone->flags = 0;
                 if (!size)
                         continue;