Commit 2b952eea authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba

btrfs: extent_io: Handle errors better in btree_write_cache_pages()

In btree_write_cache_pages(), we can only get @ret <= 0.
Add an ASSERT() for it just in case.

Then instead of submitting the write bio even 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 3065976b
...@@ -3748,7 +3748,6 @@ int btree_write_cache_pages(struct address_space *mapping, ...@@ -3748,7 +3748,6 @@ int btree_write_cache_pages(struct address_space *mapping,
.sync_io = wbc->sync_mode == WB_SYNC_ALL, .sync_io = wbc->sync_mode == WB_SYNC_ALL,
}; };
int ret = 0; int ret = 0;
int flush_ret;
int done = 0; int done = 0;
int nr_to_write_done = 0; int nr_to_write_done = 0;
struct pagevec pvec; struct pagevec pvec;
...@@ -3848,8 +3847,12 @@ int btree_write_cache_pages(struct address_space *mapping, ...@@ -3848,8 +3847,12 @@ int btree_write_cache_pages(struct address_space *mapping,
index = 0; index = 0;
goto retry; goto retry;
} }
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