diff options
author | Filipe Manana <fdmanana@suse.com> | 2014-10-10 05:45:12 -0400 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2014-11-20 20:14:28 -0500 |
commit | e6eb43142a72ba356f9fcd0f0fe2169c3642b460 (patch) | |
tree | 5a197067482910c26fc322223c9d0c5606dbeb70 | |
parent | 728404dacfddb5364d7256d821a2ea482159cbe7 (diff) |
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: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>
-rw-r--r-- | fs/btrfs/inode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 95f06936bc6e..cb5978a4a277 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -527,7 +527,10 @@ cont: | |||
527 | if (ret <= 0) { | 527 | if (ret <= 0) { |
528 | unsigned long clear_flags = EXTENT_DELALLOC | | 528 | unsigned long clear_flags = EXTENT_DELALLOC | |
529 | EXTENT_DEFRAG; | 529 | EXTENT_DEFRAG; |
530 | unsigned long page_error_op; | ||
531 | |||
530 | clear_flags |= (ret < 0) ? EXTENT_DO_ACCOUNTING : 0; | 532 | clear_flags |= (ret < 0) ? EXTENT_DO_ACCOUNTING : 0; |
533 | page_error_op = ret < 0 ? PAGE_SET_ERROR : 0; | ||
531 | 534 | ||
532 | /* | 535 | /* |
533 | * inline extent creation worked or returned error, | 536 | * inline extent creation worked or returned error, |
@@ -538,6 +541,7 @@ cont: | |||
538 | clear_flags, PAGE_UNLOCK | | 541 | clear_flags, PAGE_UNLOCK | |
539 | PAGE_CLEAR_DIRTY | | 542 | PAGE_CLEAR_DIRTY | |
540 | PAGE_SET_WRITEBACK | | 543 | PAGE_SET_WRITEBACK | |
544 | page_error_op | | ||
541 | PAGE_END_WRITEBACK); | 545 | PAGE_END_WRITEBACK); |
542 | goto free_pages_out; | 546 | goto free_pages_out; |
543 | } | 547 | } |