writeback: kupdate writeback shall not stop when more io is possible

Fix the kupdate case, which disregards wbc.more_io and stop writeback
prematurely even when there are more inodes to be synced.

wbc.more_io should always be respected.

Also remove the pages_skipped check. It will set when some page(s) of some
inode(s) cannot be written for now. Such inodes will be delayed for a while.
This variable has nothing to do with whether there are other writeable inodes.

CC: Jan Kara <[email protected]>
CC: Dave Chinner <[email protected]>
CC: Peter Zijlstra <[email protected]>
Signed-off-by: Wu Fengguang <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 476be9b10881ca947cfcd7e79d55c84563dba353..551684de13924dc256d89bb3b7ce175a02b73fdf 100644 (file)
--- a/fs/fs-writeback.c
+++ b/fs/fs-writeback.c
@@ -753,8 +753,8 @@ static long wb_writeback(struct bdi_writeback *wb,
                /*
                 * If we ran out of stuff to write, bail unless more_io got set
                 */
-               if (wbc.nr_to_write > 0 || wbc.pages_skipped > 0) {
-                       if (wbc.more_io && !wbc.for_kupdate) {
+               if (wbc.nr_to_write > 0) {
+                       if (wbc.more_io) {
                                if (wbc.nr_to_write < MAX_WRITEBACK_PAGES)
                                        continue;
                                /*