summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/file.c
diff options
context:
space:
mode:
authorAl Viro2014-04-02 20:33:16 +0200
committerAl Viro2014-05-06 23:37:55 +0200
commitaad4f8bb42af06371aa0e85bf0cd9d52c0494985 (patch)
tree8ac28ca7ea6f4676d10cde8e7f148ebe42237f39 /fs/btrfs/file.c
parentnew methods: ->read_iter() and ->write_iter() (diff)
downloadkernel-qcow2-linux-aad4f8bb42af06371aa0e85bf0cd9d52c0494985.tar.gz
kernel-qcow2-linux-aad4f8bb42af06371aa0e85bf0cd9d52c0494985.tar.xz
kernel-qcow2-linux-aad4f8bb42af06371aa0e85bf0cd9d52c0494985.zip
switch simple generic_file_aio_read() users to ->read_iter()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs/file.c')
-rw-r--r--fs/btrfs/file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index ea63a51c148c..39014d5db9d5 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -2622,9 +2622,9 @@ out:
const struct file_operations btrfs_file_operations = {
.llseek = btrfs_file_llseek,
- .read = do_sync_read,
+ .read = new_sync_read,
.write = do_sync_write,
- .aio_read = generic_file_aio_read,
+ .read_iter = generic_file_read_iter,
.splice_read = generic_file_splice_read,
.aio_write = btrfs_file_aio_write,
.mmap = btrfs_file_mmap,