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 <jack@suse.cz>
CC: Dave Chinner <david@fromorbit.com>
CC: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c
index 476be9b10881..551684de1392 100644
--- 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;
                                 /*