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/udf | |
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/udf')
-rw-r--r-- | fs/udf/file.c | 4 | ||||
-rw-r--r-- | fs/udf/inode.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/udf/file.c b/fs/udf/file.c index d2c170f8b035..ade886401658 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c | |||
@@ -119,8 +119,8 @@ static int udf_adinicb_write_end(struct file *file, | |||
119 | } | 119 | } |
120 | 120 | ||
121 | static ssize_t udf_adinicb_direct_IO(int rw, struct kiocb *iocb, | 121 | static ssize_t udf_adinicb_direct_IO(int rw, struct kiocb *iocb, |
122 | const struct iovec *iov, | 122 | struct iov_iter *iter, |
123 | loff_t offset, unsigned long nr_segs) | 123 | loff_t offset) |
124 | { | 124 | { |
125 | /* Fallback to buffered I/O. */ | 125 | /* Fallback to buffered I/O. */ |
126 | return 0; | 126 | return 0; |
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 5d643706212f..5b184c7f7dcb 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c | |||
@@ -217,18 +217,18 @@ static int udf_write_begin(struct file *file, struct address_space *mapping, | |||
217 | } | 217 | } |
218 | 218 | ||
219 | static ssize_t udf_direct_IO(int rw, struct kiocb *iocb, | 219 | static ssize_t udf_direct_IO(int rw, struct kiocb *iocb, |
220 | const struct iovec *iov, | 220 | struct iov_iter *iter, |
221 | loff_t offset, unsigned long nr_segs) | 221 | loff_t offset) |
222 | { | 222 | { |
223 | struct file *file = iocb->ki_filp; | 223 | struct file *file = iocb->ki_filp; |
224 | struct address_space *mapping = file->f_mapping; | 224 | struct address_space *mapping = file->f_mapping; |
225 | struct inode *inode = mapping->host; | 225 | struct inode *inode = mapping->host; |
226 | ssize_t ret; | 226 | ssize_t ret; |
227 | 227 | ||
228 | ret = blockdev_direct_IO(rw, iocb, inode, iov, offset, nr_segs, | 228 | ret = blockdev_direct_IO(rw, iocb, inode, iter->iov, offset, iter->nr_segs, |
229 | udf_get_block); | 229 | udf_get_block); |
230 | if (unlikely(ret < 0 && (rw & WRITE))) | 230 | if (unlikely(ret < 0 && (rw & WRITE))) |
231 | udf_write_failed(mapping, offset + iov_length(iov, nr_segs)); | 231 | udf_write_failed(mapping, offset + iov_length(iter->iov, iter->nr_segs)); |
232 | return ret; | 232 | return ret; |
233 | } | 233 | } |
234 | 234 | ||