Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933724Ab3CHWxd (ORCPT ); Fri, 8 Mar 2013 17:53:33 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:36287 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933431Ab3CHWxa (ORCPT ); Fri, 8 Mar 2013 17:53:30 -0500 From: Dave Kleikamp To: Zach Brown Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Dave Kleikamp , Jan Kara Subject: [PATCH V7 -next 29/33] udf: convert file ops from aio_read/write to read/write_iter Date: Fri, 8 Mar 2013 16:52:24 -0600 Message-Id: <1362783148-22736-30-git-send-email-dave.kleikamp@oracle.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1362783148-22736-1-git-send-email-dave.kleikamp@oracle.com> References: <1362783148-22736-1-git-send-email-dave.kleikamp@oracle.com> X-Source-IP: acsinet21.oracle.com [141.146.126.237] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1805 Lines: 53 Signed-off-by: Dave Kleikamp Cc: Jan Kara --- fs/udf/file.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/udf/file.c b/fs/udf/file.c index 339df8b..e392d60 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c @@ -133,8 +133,8 @@ const struct address_space_operations udf_adinicb_aops = { .direct_IO = udf_adinicb_direct_IO, }; -static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov, - unsigned long nr_segs, loff_t ppos) +static ssize_t udf_file_write_iter(struct kiocb *iocb, struct iov_iter *iter, + loff_t ppos) { ssize_t retval; struct file *file = iocb->ki_filp; @@ -168,7 +168,7 @@ static ssize_t udf_file_aio_write(struct kiocb *iocb, const struct iovec *iov, } else up_write(&iinfo->i_data_sem); - retval = generic_file_aio_write(iocb, iov, nr_segs, ppos); + retval = generic_file_write_iter(iocb, iter, ppos); if (retval > 0) mark_inode_dirty(inode); @@ -242,12 +242,12 @@ static int udf_release_file(struct inode *inode, struct file *filp) const struct file_operations udf_file_operations = { .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .unlocked_ioctl = udf_ioctl, .open = generic_file_open, .mmap = generic_file_mmap, .write = do_sync_write, - .aio_write = udf_file_aio_write, + .write_iter = udf_file_write_iter, .release = udf_release_file, .fsync = generic_file_fsync, .splice_read = generic_file_splice_read, -- 1.8.1.5 -- 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/