From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Kleikamp Subject: [PATCH V8 28/33] gfs2: Convert aio_read/write ops to read/write_iter Date: Thu, 25 Jul 2013 12:50:54 -0500 Message-ID: <1374774659-13121-29-git-send-email-dave.kleikamp@oracle.com> References: <1374774659-13121-1-git-send-email-dave.kleikamp@oracle.com> Cc: "Maxim V. Patlasov" , cluster-devel@redhat.com, Dave Kleikamp , linux-fsdevel@vger.kernel.org, Andrew Morton , Zach Brown To: linux-kernel@vger.kernel.org Return-path: In-Reply-To: <1374774659-13121-1-git-send-email-dave.kleikamp@oracle.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: cluster-devel-bounces@redhat.com Errors-To: cluster-devel-bounces@redhat.com List-Id: linux-fsdevel.vger.kernel.org Signed-off-by: Dave Kleikamp Cc: Steven Whitehouse Cc: cluster-devel@redhat.com --- fs/gfs2/file.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c index 72c3866..23cbdd4 100644 --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -679,10 +679,9 @@ static int gfs2_fsync(struct file *file, loff_t start, loff_t end, } /** - * gfs2_file_aio_write - Perform a write to a file + * gfs2_file_write_iter - Perform a write to a file * @iocb: The io context - * @iov: The data to write - * @nr_segs: Number of @iov segments + * @iter: The data to write * @pos: The file position * * We have to do a lock/unlock here to refresh the inode size for @@ -692,11 +691,11 @@ static int gfs2_fsync(struct file *file, loff_t start, loff_t end, * */ -static ssize_t gfs2_file_aio_write(struct kiocb *iocb, const struct iovec *iov, - unsigned long nr_segs, loff_t pos) +static ssize_t gfs2_file_write_iter(struct kiocb *iocb, struct iov_iter *iter, + loff_t pos) { struct file *file = iocb->ki_filp; - size_t writesize = iov_length(iov, nr_segs); + size_t writesize = iov_iter_count(iter); struct gfs2_inode *ip = GFS2_I(file_inode(file)); int ret; @@ -715,7 +714,7 @@ static ssize_t gfs2_file_aio_write(struct kiocb *iocb, const struct iovec *iov, gfs2_glock_dq_uninit(&gh); } - return generic_file_aio_write(iocb, iov, nr_segs, pos); + return generic_file_write_iter(iocb, iter, pos); } static int fallocate_chunk(struct inode *inode, loff_t offset, loff_t len, @@ -1047,9 +1046,9 @@ static int gfs2_flock(struct file *file, int cmd, struct file_lock *fl) const struct file_operations gfs2_file_fops = { .llseek = gfs2_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = gfs2_file_aio_write, + .write_iter = gfs2_file_write_iter, .unlocked_ioctl = gfs2_ioctl, .mmap = gfs2_mmap, .open = gfs2_open, @@ -1079,9 +1078,9 @@ const struct file_operations gfs2_dir_fops = { const struct file_operations gfs2_file_fops_nolock = { .llseek = gfs2_llseek, .read = do_sync_read, - .aio_read = generic_file_aio_read, + .read_iter = generic_file_read_iter, .write = do_sync_write, - .aio_write = gfs2_file_aio_write, + .write_iter = gfs2_file_write_iter, .unlocked_ioctl = gfs2_ioctl, .mmap = gfs2_mmap, .open = gfs2_open, -- 1.8.3.4