diff options
| author | Federico Cuello <fedux@lugmen.org.ar> | 2009-02-11 16:04:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-11 17:25:37 -0500 |
| commit | 89e1219004b3657cc014521663eeef0744f1c99d (patch) | |
| tree | 350162d8019af504c6f0461b2f54606bd6af7142 | |
| parent | 6c5979631b4b03c9288776562c18036765e398c1 (diff) | |
writeback: fix break condition
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>
| -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 c17005e73974..6106a5c7ed44 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
| @@ -1051,20 +1051,23 @@ continue_unlock: | |||
| 1051 | } | 1051 | } |
| 1052 | } | 1052 | } |
| 1053 | 1053 | ||
| 1054 | if (nr_to_write > 0) | 1054 | if (nr_to_write > 0) { |
| 1055 | nr_to_write--; | 1055 | nr_to_write--; |
| 1056 | else if (wbc->sync_mode == WB_SYNC_NONE) { | 1056 | if (nr_to_write == 0 && |
| 1057 | /* | 1057 | wbc->sync_mode == WB_SYNC_NONE) { |
| 1058 | * We stop writing back only if we are not | 1058 | /* |
| 1059 | * doing integrity sync. In case of integrity | 1059 | * We stop writing back only if we are |
| 1060 | * sync we have to keep going because someone | 1060 | * not doing integrity sync. In case of |
| 1061 | * may be concurrently dirtying pages, and we | 1061 | * integrity sync we have to keep going |
| 1062 | * might have synced a lot of newly appeared | 1062 | * because someone may be concurrently |
| 1063 | * dirty pages, but have not synced all of the | 1063 | * dirtying pages, and we might have |
| 1064 | * old dirty pages. | 1064 | * synced a lot of newly appeared dirty |
| 1065 | */ | 1065 | * pages, but have not synced all of the |
| 1066 | done = 1; | 1066 | * old dirty pages. |
| 1067 | break; | 1067 | */ |
| 1068 | done = 1; | ||
| 1069 | break; | ||
| 1070 | } | ||
| 1068 | } | 1071 | } |
| 1069 | 1072 | ||
| 1070 | if (wbc->nonblocking && bdi_write_congested(bdi)) { | 1073 | if (wbc->nonblocking && bdi_write_congested(bdi)) { |