Merge remote-tracking branch 'xfs/for-next'

[karo-tx-linux.git] / fs / dax.c

diff --git a/fs/dax.c b/fs/dax.c
index e0e9358baf3524ba1b3e3cebb23787e43df0d1c6..d8d3cc9323a1658637341d280547cda96c670c9e 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -287,8 +287,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);
@@ -358,7 +363,8 @@ static int dax_radix_entry(struct address_space *mapping, pgoff_t index,
        void *entry;
 
        WARN_ON_ONCE(pmd_entry && !dirty);
-       __mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
+       if (dirty)
+               __mark_inode_dirty(mapping->host, I_DIRTY_PAGES);
 
        spin_lock_irq(&mapping->tree_lock);