Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aad4f8bb authored by Al Viro's avatar Al Viro
Browse files

switch simple generic_file_aio_read() users to ->read_iter() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 293bc982

drivers/char/raw.c

+2 −2
Original line number Diff line number Diff line
@@ -284,8 +284,8 @@ static long raw_ctl_compat_ioctl(struct file *file, unsigned int cmd, 
#endif



static const struct file_operations raw_fops = {

	.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	= blkdev_aio_write,

	.fsync		= blkdev_fsync,

fs/9p/vfs_file.c

+3 −3
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ v9fs_cached_file_read(struct file *filp, char __user *data, size_t count, 
{

	if (filp->f_flags & O_DIRECT)

		return v9fs_direct_read(filp, data, count, offset);

	return do_sync_read(filp, data, count, offset);

	return new_sync_read(filp, data, count, offset);

}



/**
@@ -850,7 +850,7 @@ const struct file_operations v9fs_cached_file_operations = { 
	.llseek = generic_file_llseek,

	.read = v9fs_cached_file_read,

	.write = v9fs_cached_file_write,

	.aio_read = generic_file_aio_read,

	.read_iter = generic_file_read_iter,

	.aio_write = generic_file_aio_write,

	.open = v9fs_file_open,

	.release = v9fs_dir_release,
@@ -863,7 +863,7 @@ const struct file_operations v9fs_cached_file_operations_dotl = { 
	.llseek = generic_file_llseek,

	.read = v9fs_cached_file_read,

	.write = v9fs_cached_file_write,

	.aio_read = generic_file_aio_read,

	.read_iter = generic_file_read_iter,

	.aio_write = generic_file_aio_write,

	.open = v9fs_file_open,

	.release = v9fs_dir_release,

fs/adfs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ 


const struct file_operations adfs_file_operations = {

	.llseek		= generic_file_llseek,

	.read		= do_sync_read,

	.aio_read	= generic_file_aio_read,

	.read		= new_sync_read,

	.read_iter	= generic_file_read_iter,

	.mmap		= generic_file_mmap,

	.fsync		= generic_file_fsync,

	.write		= do_sync_write,

fs/affs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ static int affs_file_release(struct inode *inode, struct file *filp); 


const struct file_operations affs_file_operations = {

	.llseek		= generic_file_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	= generic_file_aio_write,

	.mmap		= generic_file_mmap,

fs/afs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ const struct file_operations afs_file_operations = { 
	.open		= afs_open,

	.release	= afs_release,

	.llseek		= generic_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,

	.aio_write	= afs_file_write,

	.mmap		= generic_file_readonly_mmap,

	.splice_read	= generic_file_splice_read,