From d48607b52cf0cf466d90c1f5d91616e888f05b11 Mon Sep 17 00:00:00 2001 From: Dave Kleikamp Date: Fri, 14 Jun 2013 15:54:28 -0500 Subject: [PATCH] afs: add support for read_iter and write_iter Signed-off-by: Dave Kleikamp Cc: David Howells Cc: linux-afs@lists.infradead.org --- fs/afs/file.c | 4 ++-- fs/afs/internal.h | 3 +-- fs/afs/write.c | 9 ++++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/fs/afs/file.c b/fs/afs/file.c index 66d50fe2ee45..3b71622e40f4 100644 --- a/fs/afs/file.c +++ b/fs/afs/file.c @@ -33,8 +33,8 @@ const struct file_operations afs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write, - .aio_read = generic_file_aio_read, - .aio_write = afs_file_write, + .read_iter = generic_file_read_iter, + .write_iter = afs_file_write, .mmap = generic_file_readonly_mmap, .splice_read = generic_file_splice_read, .fsync = afs_fsync, diff --git a/fs/afs/internal.h b/fs/afs/internal.h index a306bb6d88d9..9c048ffac900 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -747,8 +747,7 @@ extern int afs_write_end(struct file *file, struct address_space *mapping, extern int afs_writepage(struct page *, struct writeback_control *); extern int afs_writepages(struct address_space *, struct writeback_control *); extern void afs_pages_written_back(struct afs_vnode *, struct afs_call *); -extern ssize_t afs_file_write(struct kiocb *, const struct iovec *, - unsigned long, loff_t); +extern ssize_t afs_file_write(struct kiocb *, struct iov_iter *, loff_t); extern int afs_writeback_all(struct afs_vnode *); extern int afs_fsync(struct file *, loff_t, loff_t, int); diff --git a/fs/afs/write.c b/fs/afs/write.c index a890db4b9898..9fa2f596430a 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c @@ -625,15 +625,14 @@ void afs_pages_written_back(struct afs_vnode *vnode, struct afs_call *call) /* * write to an AFS file */ -ssize_t afs_file_write(struct kiocb *iocb, const struct iovec *iov, - unsigned long nr_segs, loff_t pos) +ssize_t afs_file_write(struct kiocb *iocb, struct iov_iter *iter, loff_t pos) { struct afs_vnode *vnode = AFS_FS_I(file_inode(iocb->ki_filp)); ssize_t result; - size_t count = iov_length(iov, nr_segs); + size_t count = iov_iter_count(iter); _enter("{%x.%u},{%zu},%lu,", - vnode->fid.vid, vnode->fid.vnode, count, nr_segs); + vnode->fid.vid, vnode->fid.vnode, count, iter->nr_segs); if (IS_SWAPFILE(&vnode->vfs_inode)) { printk(KERN_INFO @@ -644,7 +643,7 @@ ssize_t afs_file_write(struct kiocb *iocb, const struct iovec *iov, if (!count) return 0; - result = generic_file_aio_write(iocb, iov, nr_segs, pos); + result = generic_file_write_iter(iocb, iter, pos); if (IS_ERR_VALUE(result)) { _leave(" = %zd", result); return result; -- 2.39.5