From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 6 Mar 2014 03:52:34 +0000 (-0500)
Subject: fuse_file_aio_write(): merge initializations of iov_iter
X-Git-Tag: v4.9.8~6259^2~58
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23faa7b8db9be0be4f158cfc558460bb95d9b245;p=platform%2Fkernel%2Flinux-rpi3.git

fuse_file_aio_write(): merge initializations of iov_iter

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 36f15f9..fc54d04 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1217,6 +1217,7 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
 	err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
 	if (err)
 		goto out;
+	iov_iter_init(&i, iov, nr_segs, count, 0);
 
 	if (count == 0)
 		goto out;
@@ -1230,7 +1231,6 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
 		goto out;
 
 	if (file->f_flags & O_DIRECT) {
-		iov_iter_init(&i, iov, nr_segs, count, 0);
 		written = generic_file_direct_write(iocb, &i, pos, count, ocount);
 		if (written < 0 || written == count)
 			goto out;
@@ -1256,7 +1256,6 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
 		written += written_buffered;
 		iocb->ki_pos = pos + written_buffered;
 	} else {
-		iov_iter_init(&i, iov, nr_segs, count, 0);
 		written = fuse_perform_write(file, mapping, &i, pos);
 		if (written >= 0)
 			iocb->ki_pos = pos + written;