From: Dave Kleikamp Date: Fri, 14 Jun 2013 20:54:27 +0000 (-0500) Subject: udf: convert file ops from aio_read/write to read/write_iter X-Git-Tag: next-20130822~107^2~4 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=41323962548dc83707e3f5fd7dec848311f352b9;p=karo-tx-linux.git udf: convert file ops from aio_read/write to read/write_iter Signed-off-by: Dave Kleikamp Acked-by: Jan Kara --- diff --git a/fs/udf/file.c b/fs/udf/file.c index 339df8b81935..e392d60f3a82 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,