Btrfs: fix missing error return if writeback for extent buffer never started
PATCH 1/1 Btrfs: fix missing error return if writeback for extent buffer never started
From: Filipe Manana <[email protected]>
If lock_extent_buffer_for_io() fails, it returns a negative value, but its caller btree_write_cache_pages() ignores such error. This means that a call to flush_write_bio(), from lock_extent_buffer_for_io(), might have failed. We should make btree_write_cache_pages() notice such error values and stop immediatelly, making sure filemap_fdatawrite_range() returns an error to the transaction commit path. A failure from flush_write_bio() should also result in the endio callback end_bio_extent_buffer_writepage() being invoked, which sets the BTRFS_FS_*_ERR bits appropriately, so that there's no risk a transaction or log commit doesn't catch a writeback failure.
--- fs/btrfs/extent_io.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/btrfs/extent_io.c +4 -0
@@ -3969,6 +3969,10 @@ int btree_write_cache_pages(struct address_space *mapping,if (!ret) {free_extent_buffer (eb);continue ; + }else if (ret <0 ) { + done =1 ; +free_extent_buffer (eb); +break ; } ret =write_one_eb (eb, wbc, &epd);
Signature · 1 line
2.11.0
Quoted 13 lines · On Wed, Sep 11, 2019 at 05:42:28PM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
If
lock_extent_buffer_for_io()fails, it returns a negative value, but its callerbtree_write_cache_pages()ignores such error. This means that a call toflush_write_bio(), fromlock_extent_buffer_for_io(), might have failed. We should makebtree_write_cache_pages()notice such error values and stop immediatelly, making surefilemap_fdatawrite_range()returns an error to the transaction commit path. A failure fromflush_write_bio()should also result in the endio callbackend_bio_extent_buffer_writepage()being invoked, which sets the BTRFS_FS_*_ERR bits appropriately, so that there's no risk a transaction or log commit doesn't catch a writeback failure.
Quoted 1 line
Signed-off-by Filipe Manana <[email protected]>
Thanks,
Josef
Quoted 13 lines · On Wed, Sep 11, 2019 at 05:42:28PM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
If
lock_extent_buffer_for_io()fails, it returns a negative value, but its callerbtree_write_cache_pages()ignores such error. This means that a call toflush_write_bio(), fromlock_extent_buffer_for_io(), might have failed. We should makebtree_write_cache_pages()notice such error values and stop immediatelly, making surefilemap_fdatawrite_range()returns an error to the transaction commit path. A failure fromflush_write_bio()should also result in the endio callbackend_bio_extent_buffer_writepage()being invoked, which sets the BTRFS_FS_*_ERR bits appropriately, so that there's no risk a transaction or log commit doesn't catch a writeback failure.
Quoted 1 line
Signed-off-by Filipe Manana <[email protected]>
Added to misc-next, thanks.