Skip to content

Commit

Permalink
btrfs: extent_io: Handle errors better in extent_writepages()
Browse files Browse the repository at this point in the history
We can only get <=0 from extent_write_cache_pages, add an ASSERT() for
it just in case.

Then instead of submitting the write bio even if we got some error,
check the return value first.
If we have already hit some error, just clean up the corrupted or
half-baked bio, and return error.

If there is no error so far, then call flush_write_bio() and return the
result.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
  • Loading branch information
Qu Wenruo authored and David Sterba committed Apr 29, 2019
1 parent 2e3c251 commit a2a72fb
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions fs/btrfs/extent_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -4104,7 +4104,6 @@ int extent_writepages(struct address_space *mapping,
struct writeback_control *wbc)
{
int ret = 0;
int flush_ret;
struct extent_page_data epd = {
.bio = NULL,
.tree = &BTRFS_I(mapping->host)->io_tree,
Expand All @@ -4113,8 +4112,12 @@ int extent_writepages(struct address_space *mapping,
};

ret = extent_write_cache_pages(mapping, wbc, &epd);
flush_ret = flush_write_bio(&epd);
BUG_ON(flush_ret < 0);
ASSERT(ret <= 0);
if (ret < 0) {
end_write_bio(&epd, ret);
return ret;
}
ret = flush_write_bio(&epd);
return ret;
}

Expand Down

0 comments on commit a2a72fb

Please sign in to comment.