1 files changed, 5 insertions, 1 deletions

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index eb277bdd4c5d..01b9cb8ccf68 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -871,6 +871,7 @@ int write_cache_pages(struct address_space *mapping,
         pgoff_t uninitialized_var(writeback_index);
         pgoff_t index;
         pgoff_t end;            /* Inclusive */
+        pgoff_t done_index;
         int cycled;
         int range_whole = 0;
         long nr_to_write = wbc->nr_to_write;
@@ -897,6 +898,7 @@ int write_cache_pages(struct address_space *mapping,
                 cycled = 1; /* ignore range_cyclic tests */
         }
 retry:
+        done_index = index;
         while (!done && (index <= end) &&
                (nr_pages = pagevec_lookup_tag(&pvec, mapping, &index,
                                               PAGECACHE_TAG_DIRTY,
@@ -906,6 +908,8 @@ retry:
                 for (i = 0; i < nr_pages; i++) {
                         struct page *page = pvec.pages[i];
 
+                        done_index = page->index + 1;
+
                         /*
                          * At this point we hold neither mapping->tree_lock nor
                          * lock on the page itself: the page may be truncated or
@@ -968,7 +972,7 @@ retry:
         }
         if (!wbc->no_nrwrite_index_update) {
                 if (wbc->range_cyclic || (range_whole && nr_to_write > 0))
-                        mapping->writeback_index = index;
+                        mapping->writeback_index = done_index;
                 wbc->nr_to_write = nr_to_write;
         }