1 files changed, 4 insertions, 3 deletions

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 09af0f7cd55e..76b6f988e2fa 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -276,7 +276,7 @@ xfs_end_io(
         struct xfs_inode        *ip = XFS_I(ioend->io_inode);
         xfs_off_t               offset = ioend->io_offset;
         size_t                  size = ioend->io_size;
-        int                     error = ioend->io_bio->bi_error;
+        int                     error;
 
         /*
          * Just clean up the in-memory strutures if the fs has been shut down.
@@ -289,6 +289,7 @@ xfs_end_io(
         /*
          * Clean up any COW blocks on an I/O error.
          */
+        error = blk_status_to_errno(ioend->io_bio->bi_status);
         if (unlikely(error)) {
                 switch (ioend->io_type) {
                 case XFS_IO_COW:
@@ -332,7 +333,7 @@ xfs_end_bio(
         else if (ioend->io_append_trans)
                 queue_work(mp->m_data_workqueue, &ioend->io_work);
         else
-                xfs_destroy_ioend(ioend, bio->bi_error);
+                xfs_destroy_ioend(ioend, blk_status_to_errno(bio->bi_status));
 }
 
 STATIC int
@@ -500,7 +501,7 @@ xfs_submit_ioend(
          * time.
          */
         if (status) {
-                ioend->io_bio->bi_error = status;
+                ioend->io_bio->bi_status = errno_to_blk_status(status);
                 bio_endio(ioend->io_bio);
                 return status;
         }