Commit e6eb4314 authored by Filipe Manana's avatar Filipe Manana Committed by Chris Mason

Btrfs: report error after failure inlining extent in compressed write path

If cow_file_range_inline() failed, when called from compress_file_range(),
we were tagging the locked page for writeback, end its writeback and unlock it,
but not marking it with an error nor setting AS_EIO in inode's mapping flags.

This made it impossible for a caller of filemap_fdatawrite_range (writepages)
or filemap_fdatawait_range() to know that an error happened. And the return
value of compress_file_range() is useless because it's returned to a workqueue
task and not to the task calling filemap_fdatawrite_range (writepages).

This change applies on top of the previous patchset starting at the patch
titled:

    "[1/5] Btrfs: set page and mapping error on compressed write failure"

Which changed extent_clear_unlock_delalloc() to use SetPageError and
mapping_set_error().
Signed-off-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent 728404da
...@@ -527,7 +527,10 @@ static noinline void compress_file_range(struct inode *inode, ...@@ -527,7 +527,10 @@ static noinline void compress_file_range(struct inode *inode,
if (ret <= 0) { if (ret <= 0) {
unsigned long clear_flags = EXTENT_DELALLOC | unsigned long clear_flags = EXTENT_DELALLOC |
EXTENT_DEFRAG; EXTENT_DEFRAG;
unsigned long page_error_op;
clear_flags |= (ret < 0) ? EXTENT_DO_ACCOUNTING : 0; clear_flags |= (ret < 0) ? EXTENT_DO_ACCOUNTING : 0;
page_error_op = ret < 0 ? PAGE_SET_ERROR : 0;
/* /*
* inline extent creation worked or returned error, * inline extent creation worked or returned error,
...@@ -538,6 +541,7 @@ static noinline void compress_file_range(struct inode *inode, ...@@ -538,6 +541,7 @@ static noinline void compress_file_range(struct inode *inode,
clear_flags, PAGE_UNLOCK | clear_flags, PAGE_UNLOCK |
PAGE_CLEAR_DIRTY | PAGE_CLEAR_DIRTY |
PAGE_SET_WRITEBACK | PAGE_SET_WRITEBACK |
page_error_op |
PAGE_END_WRITEBACK); PAGE_END_WRITEBACK);
goto free_pages_out; goto free_pages_out;
} }
......
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