1 files changed, 10 insertions, 4 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 2359608d2568..143c1c25d680 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -2352,10 +2352,16 @@ int do_writepages(struct address_space *mapping, struct writeback_control *wbc)
 
         if (wbc->nr_to_write <= 0)
                 return 0;
-        if (mapping->a_ops->writepages)
-                ret = mapping->a_ops->writepages(mapping, wbc);
-        else
-                ret = generic_writepages(mapping, wbc);
+        while (1) {
+                if (mapping->a_ops->writepages)
+                        ret = mapping->a_ops->writepages(mapping, wbc);
+                else
+                        ret = generic_writepages(mapping, wbc);
+                if ((ret != -ENOMEM) || (wbc->sync_mode != WB_SYNC_ALL))
+                        break;
+                cond_resched();
+                congestion_wait(BLK_RW_ASYNC, HZ/50);
+        }
         return ret;
 }