2 files changed, 5 insertions, 3 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index f9d88183f697..9c5e6235cc74 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -210,7 +210,7 @@ int __filemap_fdatawrite_range(struct address_space *mapping, loff_t start,
         int ret;
         struct writeback_control wbc = {
                 .sync_mode = sync_mode,
-                .nr_to_write = mapping->nrpages * 2,
+                .nr_to_write = LONG_MAX,
                 .range_start = start,
                 .range_end = end,
         };
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 2e847cdcad0e..5edca676e2c3 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -963,8 +963,10 @@ retry:
                                 }
                         }
 
-                        if (--nr_to_write <= 0)
-                                done = 1;
+                        if (wbc->sync_mode == WB_SYNC_NONE) {
+                                if (--wbc->nr_to_write <= 0)
+                                        done = 1;
+                        }
                         if (wbc->nonblocking && bdi_write_congested(bdi)) {
                                 wbc->encountered_congestion = 1;
                                 done = 1;