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/hfsplus | |
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/hfsplus')
-rw-r--r-- | fs/hfsplus/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index a4f45bd88a63..7f894a5b5eaf 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c | |||
@@ -123,14 +123,14 @@ static int hfsplus_releasepage(struct page *page, gfp_t mask) | |||
123 | } | 123 | } |
124 | 124 | ||
125 | static ssize_t hfsplus_direct_IO(int rw, struct kiocb *iocb, | 125 | static ssize_t hfsplus_direct_IO(int rw, struct kiocb *iocb, |
126 | const struct iovec *iov, loff_t offset, unsigned long nr_segs) | 126 | struct iov_iter *iter, loff_t offset) |
127 | { | 127 | { |
128 | struct file *file = iocb->ki_filp; | 128 | struct file *file = iocb->ki_filp; |
129 | struct address_space *mapping = file->f_mapping; | 129 | struct address_space *mapping = file->f_mapping; |
130 | struct inode *inode = file_inode(file)->i_mapping->host; | 130 | struct inode *inode = file_inode(file)->i_mapping->host; |
131 | ssize_t ret; | 131 | ssize_t ret; |
132 | 132 | ||
133 | ret = blockdev_direct_IO(rw, iocb, inode, iov, offset, nr_segs, | 133 | ret = blockdev_direct_IO(rw, iocb, inode, iter->iov, offset, iter->nr_segs, |
134 | hfsplus_get_block); | 134 | hfsplus_get_block); |
135 | 135 | ||
136 | /* | 136 | /* |
@@ -139,7 +139,7 @@ static ssize_t hfsplus_direct_IO(int rw, struct kiocb *iocb, | |||
139 | */ | 139 | */ |
140 | if (unlikely((rw & WRITE) && ret < 0)) { | 140 | if (unlikely((rw & WRITE) && ret < 0)) { |
141 | loff_t isize = i_size_read(inode); | 141 | loff_t isize = i_size_read(inode); |
142 | loff_t end = offset + iov_length(iov, nr_segs); | 142 | loff_t end = offset + iov_length(iter->iov, iter->nr_segs); |
143 | 143 | ||
144 | if (end > isize) | 144 | if (end > isize) |
145 | hfsplus_write_failed(mapping, end); | 145 | hfsplus_write_failed(mapping, end); |