aboutsummaryrefslogtreecommitdiffstats
path: root/fs/fuse
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-03-03 22:03:20 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-06 17:32:42 -0400
commitf8579f8673b7ecdb7a81d5d5bb1d981093d9aa94 (patch)
treed4287d0dffbf3758e709238302fb8865cdd66651 /fs/fuse
parente7c24607b5d68a4cdc56e09d70a3c8bae5f0519f (diff)
generic_file_direct_write(): switch to iov_iter
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/file.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 96d513e01a5d..126deb5d0a9c 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1235,15 +1235,13 @@ static ssize_t fuse_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
1235 goto out; 1235 goto out;
1236 1236
1237 if (file->f_flags & O_DIRECT) { 1237 if (file->f_flags & O_DIRECT) {
1238 written = generic_file_direct_write(iocb, iov, &nr_segs, pos, 1238 iov_iter_init(&i, iov, nr_segs, count, 0);
1239 count, ocount); 1239 written = generic_file_direct_write(iocb, &i, pos, count, ocount);
1240 if (written < 0 || written == count) 1240 if (written < 0 || written == count)
1241 goto out; 1241 goto out;
1242 1242
1243 pos += written; 1243 pos += written;
1244 count -= written;
1245 1244
1246 iov_iter_init(&i, iov, nr_segs, count, written);
1247 written_buffered = fuse_perform_write(file, mapping, &i, pos); 1245 written_buffered = fuse_perform_write(file, mapping, &i, pos);
1248 if (written_buffered < 0) { 1246 if (written_buffered < 0) {
1249 err = written_buffered; 1247 err = written_buffered;