Commit a2a72fbd authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba

btrfs: extent_io: Handle errors better in extent_writepages()

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: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 2e3c2513
...@@ -4104,7 +4104,6 @@ int extent_writepages(struct address_space *mapping, ...@@ -4104,7 +4104,6 @@ int extent_writepages(struct address_space *mapping,
struct writeback_control *wbc) struct writeback_control *wbc)
{ {
int ret = 0; int ret = 0;
int flush_ret;
struct extent_page_data epd = { struct extent_page_data epd = {
.bio = NULL, .bio = NULL,
.tree = &BTRFS_I(mapping->host)->io_tree, .tree = &BTRFS_I(mapping->host)->io_tree,
...@@ -4113,8 +4112,12 @@ int extent_writepages(struct address_space *mapping, ...@@ -4113,8 +4112,12 @@ int extent_writepages(struct address_space *mapping,
}; };
ret = extent_write_cache_pages(mapping, wbc, &epd); ret = extent_write_cache_pages(mapping, wbc, &epd);
flush_ret = flush_write_bio(&epd); ASSERT(ret <= 0);
BUG_ON(flush_ret < 0); if (ret < 0) {
end_write_bio(&epd, ret);
return ret;
}
ret = flush_write_bio(&epd);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment