1 files changed, 10 insertions, 0 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 4fe10f93db8a..198243717da5 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -152,6 +152,9 @@ blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter, loff_t offset)
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
 
+        if (IS_DAX(inode))
+                return dax_do_io(iocb, inode, iter, offset, blkdev_get_block,
+                                NULL, DIO_SKIP_DIO_COUNT);
         return __blockdev_direct_IO(iocb, inode, I_BDEV(inode), iter, offset,
                                     blkdev_get_block, NULL, NULL,
                                     DIO_SKIP_DIO_COUNT);
@@ -443,6 +446,12 @@ long bdev_direct_access(struct block_device *bdev, sector_t sector,
         long avail;
         const struct block_device_operations *ops = bdev->bd_disk->fops;
 
+        /*
+         * The device driver is allowed to sleep, in order to make the
+         * memory directly accessible.
+         */
+        might_sleep();
+
         if (size < 0)
                 return size;
         if (!ops->direct_access)
@@ -1170,6 +1179,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
                 bdev->bd_disk = disk;
                 bdev->bd_queue = disk->queue;
                 bdev->bd_contains = bdev;
+                bdev->bd_inode->i_flags = disk->fops->direct_access ? S_DAX : 0;
                 if (!partno) {
                         ret = -ENXIO;
                         bdev->bd_part = disk_get_part(disk, partno);