1 files changed, 12 insertions, 2 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index fd2df29cc645..43f757fcf30f 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1587,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
@@ -1595,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;
         }