summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
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/gfs2
parent293bc9822fa9b3c9d4b7893bcb241e085580771a (diff)
downloadlinux-aad4f8bb42af06371aa0e85bf0cd9d52c0494985.tar.gz
linux-aad4f8bb42af06371aa0e85bf0cd9d52c0494985.tar.bz2
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/gfs2')
-rw-r--r--fs/gfs2/file.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 80d67253623c..763c9a6287d2 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -1058,8 +1058,8 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl)
const struct file_operations gfs2_file_fops = {
.llseek = gfs2_llseek,
- .read = do_sync_read,
- .aio_read = generic_file_aio_read,
+ .read = new_sync_read,
+ .read_iter = generic_file_read_iter,
.write = do_sync_write,
.aio_write = gfs2_file_aio_write,
.unlocked_ioctl = gfs2_ioctl,
@@ -1090,8 +1090,8 @@ const struct file_operations gfs2_dir_fops = {
const struct file_operations gfs2_file_fops_nolock = {
.llseek = gfs2_llseek,
- .read = do_sync_read,
- .aio_read = generic_file_aio_read,
+ .read = new_sync_read,
+ .read_iter = generic_file_read_iter,
.write = do_sync_write,
.aio_write = gfs2_file_aio_write,
.unlocked_ioctl = gfs2_ioctl,