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/ext4/inode.c | |
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/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index d7b7462a0e13..f51db730da39 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -3222,8 +3222,7 @@ retake_lock: | |||
3222 | } | 3222 | } |
3223 | 3223 | ||
3224 | static ssize_t ext4_direct_IO(int rw, struct kiocb *iocb, | 3224 | static ssize_t ext4_direct_IO(int rw, struct kiocb *iocb, |
3225 | const struct iovec *iov, loff_t offset, | 3225 | struct iov_iter *iter, loff_t offset) |
3226 | unsigned long nr_segs) | ||
3227 | { | 3226 | { |
3228 | struct file *file = iocb->ki_filp; | 3227 | struct file *file = iocb->ki_filp; |
3229 | struct inode *inode = file->f_mapping->host; | 3228 | struct inode *inode = file->f_mapping->host; |
@@ -3239,13 +3238,13 @@ static ssize_t ext4_direct_IO(int rw, struct kiocb *iocb, | |||
3239 | if (ext4_has_inline_data(inode)) | 3238 | if (ext4_has_inline_data(inode)) |
3240 | return 0; | 3239 | return 0; |
3241 | 3240 | ||
3242 | trace_ext4_direct_IO_enter(inode, offset, iov_length(iov, nr_segs), rw); | 3241 | trace_ext4_direct_IO_enter(inode, offset, iov_length(iter->iov, iter->nr_segs), rw); |
3243 | if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) | 3242 | if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) |
3244 | ret = ext4_ext_direct_IO(rw, iocb, iov, offset, nr_segs); | 3243 | ret = ext4_ext_direct_IO(rw, iocb, iter->iov, offset, iter->nr_segs); |
3245 | else | 3244 | else |
3246 | ret = ext4_ind_direct_IO(rw, iocb, iov, offset, nr_segs); | 3245 | ret = ext4_ind_direct_IO(rw, iocb, iter->iov, offset, iter->nr_segs); |
3247 | trace_ext4_direct_IO_exit(inode, offset, | 3246 | trace_ext4_direct_IO_exit(inode, offset, |
3248 | iov_length(iov, nr_segs), rw, ret); | 3247 | iov_length(iter->iov, iter->nr_segs), rw, ret); |
3249 | return ret; | 3248 | return ret; |
3250 | } | 3249 | } |
3251 | 3250 | ||