fuse_file_aio_read(): convert to ->read_iter() (37c20f16) · Commits · e / devices / android_kernel_oneplus_sm8150

fs/fuse/file.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -933,8 +933,7 @@ static int fuse_readpages(struct file file, struct address_space mapping,
		return err;
		}

		static ssize_t fuse_file_aio_read(struct kiocb iocb, const struct iovec iov,
		unsigned long nr_segs, loff_t pos)
		static ssize_t fuse_file_read_iter(struct kiocb iocb, struct iov_iter to)
		{
		struct inode *inode = iocb->ki_filp->f_mapping->host;
		struct fuse_conn *fc = get_fuse_conn(inode);
		@@ -945,14 +944,14 @@ static ssize_t fuse_file_aio_read(struct kiocb iocb, const struct iovec iov,
		* i_size is up to date).
		*/
		if (fc->auto_inval_data \|\|
		(pos + iov_length(iov, nr_segs) > i_size_read(inode))) {
		(iocb->ki_pos + iov_iter_count(to) > i_size_read(inode))) {
		int err;
		err = fuse_update_attributes(inode, NULL, iocb->ki_filp, NULL);
		if (err)
		return err;
		}

		return generic_file_aio_read(iocb, iov, nr_segs, pos);
		return generic_file_read_iter(iocb, to);
		}

		static void fuse_write_fill(struct fuse_req req, struct fuse_file ff,
		@@ -3038,8 +3037,8 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,

		static const struct file_operations fuse_file_operations = {
		.llseek = fuse_file_llseek,
		.read = do_sync_read,
		.aio_read = fuse_file_aio_read,
		.read = new_sync_read,
		.read_iter = fuse_file_read_iter,
		.write = do_sync_write,
		.aio_write = fuse_file_aio_write,
		.mmap = fuse_file_mmap,