3 files changed, 8 insertions, 1 deletions

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index bf3f424e0013..420fe26d32d5 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1746,6 +1746,9 @@ int extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end,
         if (page_ops == 0)
                 return 0;
 
+        if ((page_ops & PAGE_SET_ERROR) && nr_pages > 0)
+                mapping_set_error(inode->i_mapping, -EIO);
+
         while (nr_pages > 0) {
                 ret = find_get_pages_contig(inode->i_mapping, index,
                                      min_t(unsigned long,
@@ -1763,6 +1766,8 @@ int extent_clear_unlock_delalloc(struct inode *inode, u64 start, u64 end,
                                 clear_page_dirty_for_io(pages[i]);
                         if (page_ops & PAGE_SET_WRITEBACK)
                                 set_page_writeback(pages[i]);
+                        if (page_ops & PAGE_SET_ERROR)
+                                SetPageError(pages[i]);
                         if (page_ops & PAGE_END_WRITEBACK)
                                 end_page_writeback(pages[i]);
                         if (page_ops & PAGE_UNLOCK)
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 6d4b938be986..ece9ce87edff 100644
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -49,6 +49,7 @@
 #define PAGE_SET_WRITEBACK      (1 << 2)
 #define PAGE_END_WRITEBACK      (1 << 3)
 #define PAGE_SET_PRIVATE2       (1 << 4)
+#define PAGE_SET_ERROR          (1 << 5)
 
 /*
  * page->private values.  Every page that is controlled by the extent
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index d23362f4464e..fcb9a38fc9d3 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -832,7 +832,8 @@ out_free:
                                      NULL, EXTENT_LOCKED | EXTENT_DELALLOC |
                                      EXTENT_DEFRAG | EXTENT_DO_ACCOUNTING,
                                      PAGE_UNLOCK | PAGE_CLEAR_DIRTY |
-                                     PAGE_SET_WRITEBACK | PAGE_END_WRITEBACK);
+                                     PAGE_SET_WRITEBACK | PAGE_END_WRITEBACK |
+                                     PAGE_SET_ERROR);
         kfree(async_extent);
         goto again;
 }