1 files changed, 13 insertions, 5 deletions

diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
index 36b369697a13..6b9878a24182 100644
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
@@ -689,14 +689,22 @@ retry:
                         inode_dio_done(inode);
                         goto locked;
                 }
-                ret = __blockdev_direct_IO(rw, iocb, inode,
-                                 inode->i_sb->s_bdev, iter, offset,
-                                 ext4_get_block, NULL, NULL, 0);
+                if (IS_DAX(inode))
+                        ret = dax_do_io(rw, iocb, inode, iter, offset,
+                                        ext4_get_block, NULL, 0);
+                else
+                        ret = __blockdev_direct_IO(rw, iocb, inode,
+                                        inode->i_sb->s_bdev, iter, offset,
+                                        ext4_get_block, NULL, NULL, 0);
                 inode_dio_done(inode);
         } else {
 locked:
-                ret = blockdev_direct_IO(rw, iocb, inode, iter,
-                                 offset, ext4_get_block);
+                if (IS_DAX(inode))
+                        ret = dax_do_io(rw, iocb, inode, iter, offset,
+                                        ext4_get_block, NULL, DIO_LOCKING);
+                else
+                        ret = blockdev_direct_IO(rw, iocb, inode, iter,
+                                        offset, ext4_get_block);
 
                 if (unlikely((rw & WRITE) && ret < 0)) {
                         loff_t isize = i_size_read(inode);