btrfs: return any hit error from extent_writepage_io()

Since the support of bs < ps support, extent_writepage_io() will submit
multiple blocks inside the folio.

But if we hit error submitting one sector, but the next sector can still
be submitted successfully, the function extent_writepage_io() will still
return 0.

This will make btrfs to silently ignore the error without setting error
flag for the filemap.

Fix it by recording the first error hit, and always return that value.

Fixes: 8bf334beb349 ("btrfs: fix double accounting race when extent_writepage_io() failed")
Reviewed-by: Daniel Vacek <neelx@suse.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 5f0cce1bb7c6f846a4f9901b510474e7ef1d8ea7..0782533aad5174546c25d0473b29b792c6be2618 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1679,7 +1679,7 @@ static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,
        struct btrfs_fs_info *fs_info = inode->root->fs_info;
        unsigned long range_bitmap = 0;
        bool submitted_io = false;
-       bool error = false;
+       int found_error = 0;
        const u64 folio_start = folio_pos(folio);
        const unsigned int blocks_per_folio = btrfs_blocks_per_folio(fs_info, folio);
        u64 cur;
@@ -1743,7 +1743,8 @@ static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,
                         */
                        btrfs_mark_ordered_io_finished(inode, folio, cur,
                                                       fs_info->sectorsize, false);
-                       error = true;
+                       if (!found_error)
+                               found_error = ret;
                        continue;
                }
                submitted_io = true;
@@ -1760,11 +1761,11 @@ static noinline_for_stack int extent_writepage_io(struct btrfs_inode *inode,
         * If we hit any error, the corresponding sector will have its dirty
         * flag cleared and writeback finished, thus no need to handle the error case.
         */
-       if (!submitted_io && !error) {
+       if (!submitted_io && !found_error) {
                btrfs_folio_set_writeback(fs_info, folio, start, len);
                btrfs_folio_clear_writeback(fs_info, folio, start, len);
        }
-       return ret;
+       return found_error;
 }
 
 /*