diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-03-04 21:27:34 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 17:32:44 -0400 |
commit | d8d3d94b80aa1a1c0ca75c58b8abdc7356f38418 (patch) | |
tree | 132f846b04371426b8795475597846aae75e7e07 /fs/fuse | |
parent | cb66a7a1f149ff705fa37cad6d1252b046e0ad4f (diff) |
pass iov_iter to ->direct_IO()
unmodified, for now
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/fuse')
-rw-r--r-- | fs/fuse/file.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index 9c7f346879e7..17d96f36df15 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
@@ -2890,8 +2890,8 @@ static inline loff_t fuse_round_up(loff_t off) | |||
2890 | } | 2890 | } |
2891 | 2891 | ||
2892 | static ssize_t | 2892 | static ssize_t |
2893 | fuse_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, | 2893 | fuse_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, |
2894 | loff_t offset, unsigned long nr_segs) | 2894 | loff_t offset) |
2895 | { | 2895 | { |
2896 | ssize_t ret = 0; | 2896 | ssize_t ret = 0; |
2897 | struct file *file = iocb->ki_filp; | 2897 | struct file *file = iocb->ki_filp; |
@@ -2900,7 +2900,7 @@ fuse_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, | |||
2900 | loff_t pos = 0; | 2900 | loff_t pos = 0; |
2901 | struct inode *inode; | 2901 | struct inode *inode; |
2902 | loff_t i_size; | 2902 | loff_t i_size; |
2903 | size_t count = iov_length(iov, nr_segs); | 2903 | size_t count = iov_length(iter->iov, iter->nr_segs); |
2904 | struct fuse_io_priv *io; | 2904 | struct fuse_io_priv *io; |
2905 | 2905 | ||
2906 | pos = offset; | 2906 | pos = offset; |
@@ -2944,9 +2944,9 @@ fuse_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, | |||
2944 | io->async = false; | 2944 | io->async = false; |
2945 | 2945 | ||
2946 | if (rw == WRITE) | 2946 | if (rw == WRITE) |
2947 | ret = __fuse_direct_write(io, iov, nr_segs, &pos); | 2947 | ret = __fuse_direct_write(io, iter->iov, iter->nr_segs, &pos); |
2948 | else | 2948 | else |
2949 | ret = __fuse_direct_read(io, iov, nr_segs, &pos, count); | 2949 | ret = __fuse_direct_read(io, iter->iov, iter->nr_segs, &pos, count); |
2950 | 2950 | ||
2951 | if (io->async) { | 2951 | if (io->async) { |
2952 | fuse_aio_complete(io, ret < 0 ? ret : 0, -1); | 2952 | fuse_aio_complete(io, ret < 0 ? ret : 0, -1); |