1 files changed, 7 insertions, 2 deletions

diff --git a/fs/dax.c b/fs/dax.c
index bbb2ad783770..90322eb7498c 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -286,8 +286,13 @@ ssize_t dax_do_io(struct kiocb *iocb, struct inode *inode,
         if ((flags & DIO_LOCKING) && iov_iter_rw(iter) == READ)
                 inode_unlock(inode);
 
-        if ((retval > 0) && end_io)
-                end_io(iocb, pos, retval, bh.b_private);
+        if (end_io) {
+                int err;
+
+                err = end_io(iocb, pos, retval, bh.b_private);
+                if (err)
+                        retval = err;
+        }
 
         if (!(flags & DIO_SKIP_DIO_COUNT))
                 inode_dio_end(inode);