diff options
| author | Richard Kennedy <richard@rsk.demon.co.uk> | 2010-05-30 22:49:19 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 10:21:11 -0700 |
| commit | fe018ae1417dd3e02bdf42190b688afc17ccda46 (patch) | |
| tree | a9742acf861694242fd35efca060662b39aabb0a /fs | |
| parent | b387026e9ffb1167ab14b40a81bc37fbb0068e04 (diff) | |
ext4: return correct wbc.nr_to_write in ext4_da_writepages
commit 2faf2e19dd0e060eeb32442858ef495ac3083277 upstream (as of v2.6.33-rc3)
When ext4_da_writepages increases the nr_to_write in writeback_control
then it must always re-base the return value. Originally there was a
(misguided) attempt prevent wbc.nr_to_write from going negative. In
fact, it's necessary to allow nr_to_write to be negative so that
wb_writeback() can correctly calculate how many pages were actually
written.
Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 9b81b7688e5..89f4362e556 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3010,8 +3010,7 @@ retry: out_writepages: if (!no_nrwrite_index_update) wbc->no_nrwrite_index_update = 0; - if (wbc->nr_to_write > nr_to_writebump) - wbc->nr_to_write -= nr_to_writebump; + wbc->nr_to_write -= nr_to_writebump; wbc->range_start = range_start; trace_ext4_da_writepages_result(inode, wbc, ret, pages_written); return ret; |