aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ext4/inode.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index ae6e2f43d873..617c9cbba182 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2900,7 +2900,6 @@ static int ext4_da_writepages(struct address_space *mapping,
2900 struct mpage_da_data mpd; 2900 struct mpage_da_data mpd;
2901 struct inode *inode = mapping->host; 2901 struct inode *inode = mapping->host;
2902 int pages_written = 0; 2902 int pages_written = 0;
2903 long pages_skipped;
2904 unsigned int max_pages; 2903 unsigned int max_pages;
2905 int range_cyclic, cycled = 1, io_done = 0; 2904 int range_cyclic, cycled = 1, io_done = 0;
2906 int needed_blocks, ret = 0; 2905 int needed_blocks, ret = 0;
@@ -2986,8 +2985,6 @@ static int ext4_da_writepages(struct address_space *mapping,
2986 mpd.wbc = wbc; 2985 mpd.wbc = wbc;
2987 mpd.inode = mapping->host; 2986 mpd.inode = mapping->host;
2988 2987
2989 pages_skipped = wbc->pages_skipped;
2990
2991retry: 2988retry:
2992 if (wbc->sync_mode == WB_SYNC_ALL) 2989 if (wbc->sync_mode == WB_SYNC_ALL)
2993 tag_pages_for_writeback(mapping, index, end); 2990 tag_pages_for_writeback(mapping, index, end);
@@ -3047,7 +3044,6 @@ retry:
3047 * and try again 3044 * and try again
3048 */ 3045 */
3049 jbd2_journal_force_commit_nested(sbi->s_journal); 3046 jbd2_journal_force_commit_nested(sbi->s_journal);
3050 wbc->pages_skipped = pages_skipped;
3051 ret = 0; 3047 ret = 0;
3052 } else if (ret == MPAGE_DA_EXTENT_TAIL) { 3048 } else if (ret == MPAGE_DA_EXTENT_TAIL) {
3053 /* 3049 /*
@@ -3055,7 +3051,6 @@ retry:
3055 * rest of the pages 3051 * rest of the pages
3056 */ 3052 */
3057 pages_written += mpd.pages_written; 3053 pages_written += mpd.pages_written;
3058 wbc->pages_skipped = pages_skipped;
3059 ret = 0; 3054 ret = 0;
3060 io_done = 1; 3055 io_done = 1;
3061 } else if (wbc->nr_to_write) 3056 } else if (wbc->nr_to_write)
@@ -3073,11 +3068,6 @@ retry:
3073 wbc->range_end = mapping->writeback_index - 1; 3068 wbc->range_end = mapping->writeback_index - 1;
3074 goto retry; 3069 goto retry;
3075 } 3070 }
3076 if (pages_skipped != wbc->pages_skipped)
3077 ext4_msg(inode->i_sb, KERN_CRIT,
3078 "This should not happen leaving %s "
3079 "with nr_to_write = %ld ret = %d",
3080 __func__, wbc->nr_to_write, ret);
3081 3071
3082 /* Update index */ 3072 /* Update index */
3083 wbc->range_cyclic = range_cyclic; 3073 wbc->range_cyclic = range_cyclic;