From ebf2401719bb24afc893f37a6502911058d84709 Mon Sep 17 00:00:00 2001 From: Dave Kleikamp Date: Tue, 15 Oct 2013 13:44:41 -0500 Subject: [PATCH] ubifs: convert file ops from aio_read/write to read/write_iter Signed-off-by: Dave Kleikamp Cc: Artem Bityutskiy Cc: Adrian Hunter Cc: linux-mtd@lists.infradead.org --- fs/ubifs/file.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index 123c79b7261e..22924e048ac0 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -44,7 +44,7 @@ * 'ubifs_writepage()' we are only guaranteed that the page is locked. * * Similarly, @i_mutex is not always locked in 'ubifs_readpage()', e.g., the - * read-ahead path does not lock it ("sys_read -> generic_file_aio_read -> + * read-ahead path does not lock it ("sys_read -> generic_file_read_iter -> * ondemand_readahead -> readpage"). In case of readahead, @I_SYNC flag is not * set as well. However, UBIFS disables readahead. */ @@ -1396,8 +1396,8 @@ static int update_mctime(struct ubifs_info *c, struct inode *inode) return 0; } -static ssize_t ubifs_aio_write(struct kiocb *iocb, const struct iovec *iov, - unsigned long nr_segs, loff_t pos) +static ssize_t ubifs_write_iter(struct kiocb *iocb, struct iov_iter *iter, + loff_t pos) { int err; struct inode *inode = iocb->ki_filp->f_mapping->host; @@ -1407,7 +1407,7 @@ static ssize_t ubifs_aio_write(struct kiocb *iocb, const struct iovec *iov, if (err) return err; - return generic_file_aio_write(iocb, iov, nr_segs, pos); + return generic_file_write_iter(iocb, iter, pos); } static int ubifs_set_page_dirty(struct page *page) @@ -1583,8 +1583,8 @@ const struct file_operations ubifs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = ubifs_aio_write, + .read_iter = generic_file_read_iter, + .write_iter = ubifs_write_iter, .mmap = ubifs_file_mmap, .fsync = ubifs_fsync, .unlocked_ioctl = ubifs_ioctl, -- 2.39.5