1 files changed, 8 insertions, 0 deletions

diff --git a/mm/vmscan.c b/mm/vmscan.c
index e73d0206ddd..828530e2794 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1202,6 +1202,14 @@ static int too_many_isolated(struct zone *zone, int file,
                 isolated = zone_page_state(zone, NR_ISOLATED_ANON);
         }
 
+        /*
+         * GFP_NOIO/GFP_NOFS callers are allowed to isolate more pages, so they
+         * won't get blocked by normal direct-reclaimers, forming a circular
+         * deadlock.
+         */
+        if ((sc->gfp_mask & GFP_IOFS) == GFP_IOFS)
+                inactive >>= 3;
+
         return isolated > inactive;
 }