btrfs: switch to iomap_dio_rw() for dio

[linux-2.6-microblaze.git] / fs / btrfs / file.c

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 2c14312..dff89d0 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1819,7 +1819,7 @@ static ssize_t __btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from)
        loff_t endbyte;
        int err;
 
-       written = generic_file_direct_write(iocb, from);
+       written = btrfs_direct_IO(iocb, from);
 
        if (written < 0 || !iov_iter_count(from))
                return written;
@@ -3476,9 +3476,26 @@ static int btrfs_file_open(struct inode *inode, struct file *filp)
        return generic_file_open(inode, filp);
 }
 
+static ssize_t btrfs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
+{
+       ssize_t ret = 0;
+
+       if (iocb->ki_flags & IOCB_DIRECT) {
+               struct inode *inode = file_inode(iocb->ki_filp);
+
+               inode_lock_shared(inode);
+               ret = btrfs_direct_IO(iocb, to);
+               inode_unlock_shared(inode);
+               if (ret < 0)
+                       return ret;
+       }
+
+       return generic_file_buffered_read(iocb, to, ret);
+}
+
 const struct file_operations btrfs_file_operations = {
        .llseek         = btrfs_file_llseek,
-       .read_iter      = generic_file_read_iter,
+       .read_iter      = btrfs_file_read_iter,
        .splice_read    = generic_file_splice_read,
        .write_iter     = btrfs_file_write_iter,
        .mmap           = btrfs_file_mmap,