From: Richard Kennedy Date: Mon, 31 May 2010 02:49:19 +0000 (-0400) Subject: ext4: return correct wbc.nr_to_write in ext4_da_writepages X-Git-Tag: firefly_0821_release~10186^2~1348 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe018ae1417dd3e02bdf42190b688afc17ccda46;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: "Theodore Ts'o" Signed-off-by: Greg Kroah-Hartman --- diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 9b81b7688e5f..89f4362e5569 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;