From: Dave Kleikamp Date: Fri, 14 Jun 2013 20:54:29 +0000 (-0500) Subject: ecrpytfs: Convert aio_read/write ops to read/write_iter X-Git-Tag: next-20130919~60^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=99e3de703fdd2f70b5efb310cf7b9c6cf492d285;p=karo-tx-linux.git ecrpytfs: Convert aio_read/write ops to read/write_iter Signed-off-by: Dave Kleikamp Cc: Tyler Hicks Cc: Dustin Kirkland Cc: ecryptfs@vger.kernel.org --- diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index 992cf95830b5..3ed6e5f5bb4b 100644 --- a/fs/ecryptfs/file.c +++ b/fs/ecryptfs/file.c @@ -37,22 +37,21 @@ /** * ecryptfs_read_update_atime * - * generic_file_read updates the atime of upper layer inode. But, it + * generic_file_read_iter updates the atime of upper layer inode. But, it * doesn't give us a chance to update the atime of the lower layer - * inode. This function is a wrapper to generic_file_read. It - * updates the atime of the lower level inode if generic_file_read + * inode. This function is a wrapper to generic_file_read_iter. It + * updates the atime of the lower level inode if generic_file_read_iter * returns without any errors. This is to be used only for file reads. * The function to be used for directory reads is ecryptfs_read. */ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb, - const struct iovec *iov, - unsigned long nr_segs, loff_t pos) + struct iov_iter *iter, loff_t pos) { ssize_t rc; struct path *path; struct file *file = iocb->ki_filp; - rc = generic_file_aio_read(iocb, iov, nr_segs, pos); + rc = generic_file_read_iter(iocb, iter, pos); /* * Even though this is a async interface, we need to wait * for IO to finish to update atime @@ -357,9 +356,9 @@ const struct file_operations ecryptfs_dir_fops = { const struct file_operations ecryptfs_main_fops = { .llseek = generic_file_llseek, .read = do_sync_read, - .aio_read = ecryptfs_read_update_atime, + .read_iter = ecryptfs_read_update_atime, .write = do_sync_write, - .aio_write = generic_file_aio_write, + .write_iter = generic_file_write_iter, .iterate = ecryptfs_readdir, .unlocked_ioctl = ecryptfs_unlocked_ioctl, #ifdef CONFIG_COMPAT