Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935000Ab3JPOM0 (ORCPT ); Wed, 16 Oct 2013 10:12:26 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:26633 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934611Ab3JPOFy (ORCPT ); Wed, 16 Oct 2013 10:05:54 -0400 From: Dave Kleikamp To: linux-kernel@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, Andrew Morton , "Maxim V. Patlasov" , Zach Brown , Christoph Hellwig , Dave Kleikamp , Tyler Hicks , Dustin Kirkland , ecryptfs@vger.kernel.org Subject: [PATCH V9 31/33] ecrpytfs: Convert aio_read/write ops to read/write_iter Date: Wed, 16 Oct 2013 09:04:44 -0500 Message-Id: <1381932286-14978-32-git-send-email-dave.kleikamp@oracle.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1381932286-14978-1-git-send-email-dave.kleikamp@oracle.com> References: <1381932286-14978-1-git-send-email-dave.kleikamp@oracle.com> X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2279 Lines: 60 Signed-off-by: Dave Kleikamp Cc: Tyler Hicks Cc: Dustin Kirkland Cc: ecryptfs@vger.kernel.org --- fs/ecryptfs/file.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index 992cf95..3ed6e5f 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 -- 1.8.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/