diff options
| author | Federico Cuello <fedux@lugmen.org.ar> | 2009-02-11 13:04:39 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-17 09:46:17 -0800 |
| commit | 3c5badb6ff029a53c281a2bab62ff9d12a04725b (patch) | |
| tree | 8187c2694e8fddedd393ec3edae39421709d691b /mm | |
| parent | 7d120e20744a6a8d9dc3a3342bf9c385c44a3aaf (diff) | |
| download | lwn-3c5badb6ff029a53c281a2bab62ff9d12a04725b.tar.gz lwn-3c5badb6ff029a53c281a2bab62ff9d12a04725b.zip | |
writeback: fix break condition
commit 89e1219004b3657cc014521663eeef0744f1c99d upstream.
Commit dcf6a79dda5cc2a2bec183e50d829030c0972aaa ("write-back: fix
nr_to_write counter") fixed nr_to_write counter, but didn't set the break
condition properly.
If nr_to_write == 0 after being decremented it will loop one more time
before setting done = 1 and breaking the loop.
[akpm@linux-foundation.org: coding-style fixes]
Cc: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Acked-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page-writeback.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 345b5f7abb7b..5f7cdc254e68 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -985,20 +985,23 @@ continue_unlock: } } - if (wbc->nr_to_write > 0) + if (wbc->nr_to_write > 0) { wbc->nr_to_write--; - else if (wbc->sync_mode == WB_SYNC_NONE) { - /* - * We stop writing back only if we are not - * doing integrity sync. In case of integrity - * sync we have to keep going because someone - * may be concurrently dirtying pages, and we - * might have synced a lot of newly appeared - * dirty pages, but have not synced all of the - * old dirty pages. - */ - done = 1; - break; + if (wbc->nr_to_write == 0 && + wbc->sync_mode == WB_SYNC_NONE) { + /* + * We stop writing back only if we are + * not doing integrity sync. In case of + * integrity sync we have to keep going + * because someone may be concurrently + * dirtying pages, and we might have + * synced a lot of newly appeared dirty + * pages, but have not synced all of the + * old dirty pages. + */ + done = 1; + break; + } } if (wbc->nonblocking && bdi_write_congested(bdi)) { |