Merge tag 'for-5.12-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

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

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 2c28266..0e155f0 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1942,8 +1942,8 @@ relock:
                goto buffered;
        }
 
-       dio = __iomap_dio_rw(iocb, from, &btrfs_dio_iomap_ops,
-                            &btrfs_dio_ops, is_sync_kiocb(iocb));
+       dio = __iomap_dio_rw(iocb, from, &btrfs_dio_iomap_ops, &btrfs_dio_ops,
+                            0);
 
        btrfs_inode_unlock(inode, ilock_flags);
 
@@ -3621,8 +3621,7 @@ static ssize_t btrfs_direct_read(struct kiocb *iocb, struct iov_iter *to)
                return 0;
 
        btrfs_inode_lock(inode, BTRFS_ILOCK_SHARED);
-       ret = iomap_dio_rw(iocb, to, &btrfs_dio_iomap_ops, &btrfs_dio_ops,
-                          is_sync_kiocb(iocb));
+       ret = iomap_dio_rw(iocb, to, &btrfs_dio_iomap_ops, &btrfs_dio_ops, 0);
        btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);
        return ret;
 }
@@ -3638,7 +3637,7 @@ static ssize_t btrfs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
                        return ret;
        }
 
-       return generic_file_buffered_read(iocb, to, ret);
+       return filemap_read(iocb, to, ret);
 }
 
 const struct file_operations btrfs_file_operations = {