Skip to content

Commit 504d81c

Browse files
Christoph Hellwiggregkh
authored andcommitted
btrfs: don't stop integrity writeback too early
commit effa24f upstream. extent_write_cache_pages stops writing pages as soon as nr_to_write hits zero. That is the right thing for opportunistic writeback, but incorrect for data integrity writeback, which needs to ensure that no dirty pages are left in the range. Thus only stop the writeback for WB_SYNC_NONE if nr_to_write hits 0. This is a port of write_cache_pages changes in commit 05fe478 ("mm: write_cache_pages integrity fix"). Note that I've only trigger the problem with other changes to the btrfs writeback code, but this condition seems worthwhile fixing anyway. CC: stable@vger.kernel.org # 4.14+ Reviewed-by: Josef Bacik <josef@toxicpanda.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: David Sterba <dsterba@suse.com> [ updated comment ] Signed-off-by: David Sterba <dsterba@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4e18c82 commit 504d81c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

fs/btrfs/extent_io.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3015,11 +3015,12 @@ int btree_write_cache_pages(struct address_space *mapping,
30153015
}
30163016

30173017
/*
3018-
* the filesystem may choose to bump up nr_to_write.
3018+
* The filesystem may choose to bump up nr_to_write.
30193019
* We have to make sure to honor the new nr_to_write
3020-
* at any time
3020+
* at any time.
30213021
*/
3022-
nr_to_write_done = wbc->nr_to_write <= 0;
3022+
nr_to_write_done = (wbc->sync_mode == WB_SYNC_NONE &&
3023+
wbc->nr_to_write <= 0);
30233024
}
30243025
pagevec_release(&pvec);
30253026
cond_resched();

0 commit comments

Comments
 (0)