aboutsummaryrefslogtreecommitdiffstats
path: root/fs/9p
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-04-02 14:33:16 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-06 17:37:55 -0400
commitaad4f8bb42af06371aa0e85bf0cd9d52c0494985 (patch)
tree8ac28ca7ea6f4676d10cde8e7f148ebe42237f39 /fs/9p
parent293bc9822fa9b3c9d4b7893bcb241e085580771a (diff)
switch simple generic_file_aio_read() users to ->read_iter()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/9p')
-rw-r--r--fs/9p/vfs_file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index d8223209d4b1..47e0597d1e9b 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -695,7 +695,7 @@ v9fs_cached_file_read(struct file *filp, char __user *data, size_t count,
695{ 695{
696 if (filp->f_flags & O_DIRECT) 696 if (filp->f_flags & O_DIRECT)
697 return v9fs_direct_read(filp, data, count, offset); 697 return v9fs_direct_read(filp, data, count, offset);
698 return do_sync_read(filp, data, count, offset); 698 return new_sync_read(filp, data, count, offset);
699} 699}
700 700
701/** 701/**
@@ -850,7 +850,7 @@ const struct file_operations v9fs_cached_file_operations = {
850 .llseek = generic_file_llseek, 850 .llseek = generic_file_llseek,
851 .read = v9fs_cached_file_read, 851 .read = v9fs_cached_file_read,
852 .write = v9fs_cached_file_write, 852 .write = v9fs_cached_file_write,
853 .aio_read = generic_file_aio_read, 853 .read_iter = generic_file_read_iter,
854 .aio_write = generic_file_aio_write, 854 .aio_write = generic_file_aio_write,
855 .open = v9fs_file_open, 855 .open = v9fs_file_open,
856 .release = v9fs_dir_release, 856 .release = v9fs_dir_release,
@@ -863,7 +863,7 @@ const struct file_operations v9fs_cached_file_operations_dotl = {
863 .llseek = generic_file_llseek, 863 .llseek = generic_file_llseek,
864 .read = v9fs_cached_file_read, 864 .read = v9fs_cached_file_read,
865 .write = v9fs_cached_file_write, 865 .write = v9fs_cached_file_write,
866 .aio_read = generic_file_aio_read, 866 .read_iter = generic_file_read_iter,
867 .aio_write = generic_file_aio_write, 867 .aio_write = generic_file_aio_write,
868 .open = v9fs_file_open, 868 .open = v9fs_file_open,
869 .release = v9fs_dir_release, 869 .release = v9fs_dir_release,