diff --git a/[refs] b/[refs] index 042a2724a465..833546502c79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3ddec7635b6fb37cb49e3553bdeea59642be653 +refs/heads/master: 7fbdea32328312c65870c397a0a436c3226c8631 diff --git a/trunk/fs/fs-writeback.c b/trunk/fs/fs-writeback.c index 476be9b10881..551684de1392 100644 --- a/trunk/fs/fs-writeback.c +++ b/trunk/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; /*