3 files changed, 8 insertions, 3 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index fd57442186cb..3342067ca436 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -190,8 +190,8 @@ int __filemap_fdatawrite_range(struct address_space *mapping, loff_t start,
         struct writeback_control wbc = {
                 .sync_mode = sync_mode,
                 .nr_to_write = mapping->nrpages * 2,
-                .start = start,
-                .end = end,
+                .range_start = start,
+                .range_end = end,
         };
 
         if (!mapping_cap_writeback_dirty(mapping))
@@ -204,7 +204,7 @@ int __filemap_fdatawrite_range(struct address_space *mapping, loff_t start,
 static inline int __filemap_fdatawrite(struct address_space *mapping,
         int sync_mode)
 {
-        return __filemap_fdatawrite_range(mapping, 0, 0, sync_mode);
+        return __filemap_fdatawrite_range(mapping, 0, LLONG_MAX, sync_mode);
 }
 
 int filemap_fdatawrite(struct address_space *mapping)
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 75d7f48b79bb..8ccf6f1b1473 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -204,6 +204,7 @@ static void balance_dirty_pages(struct address_space *mapping)
                         .sync_mode      = WB_SYNC_NONE,
                         .older_than_this = NULL,
                         .nr_to_write    = write_chunk,
+                        .range_cyclic   = 1,
                 };
 
                 get_dirty_limits(&wbs, &background_thresh,
@@ -331,6 +332,7 @@ static void background_writeout(unsigned long _min_pages)
                 .older_than_this = NULL,
                 .nr_to_write    = 0,
                 .nonblocking    = 1,
+                .range_cyclic   = 1,
         };
 
         for ( ; ; ) {
@@ -407,6 +409,7 @@ static void wb_kupdate(unsigned long arg)
                 .nr_to_write    = 0,
                 .nonblocking    = 1,
                 .for_kupdate    = 1,
+                .range_cyclic   = 1,
         };
 
         sync_supers();
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 46be8a02280e..bc5d4f43036c 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -339,6 +339,8 @@ pageout_t pageout(struct page *page, struct address_space *mapping)
                 struct writeback_control wbc = {
                         .sync_mode = WB_SYNC_NONE,
                         .nr_to_write = SWAP_CLUSTER_MAX,
+                        .range_start = 0,
+                        .range_end = LLONG_MAX,
                         .nonblocking = 1,
                         .for_reclaim = 1,
                 };