diff options
Diffstat (limited to 'fs/hfs')
-rw-r--r-- | fs/hfs/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c index 9e2fecd62f62..09cff13528c5 100644 --- a/fs/hfs/inode.c +++ b/fs/hfs/inode.c | |||
@@ -125,15 +125,15 @@ static int hfs_releasepage(struct page *page, gfp_t mask) | |||
125 | } | 125 | } |
126 | 126 | ||
127 | static ssize_t hfs_direct_IO(int rw, struct kiocb *iocb, | 127 | static ssize_t hfs_direct_IO(int rw, struct kiocb *iocb, |
128 | const struct iovec *iov, loff_t offset, unsigned long nr_segs) | 128 | struct iov_iter *iter, loff_t offset) |
129 | { | 129 | { |
130 | struct file *file = iocb->ki_filp; | 130 | struct file *file = iocb->ki_filp; |
131 | struct address_space *mapping = file->f_mapping; | 131 | struct address_space *mapping = file->f_mapping; |
132 | struct inode *inode = file_inode(file)->i_mapping->host; | 132 | struct inode *inode = file_inode(file)->i_mapping->host; |
133 | ssize_t ret; | 133 | ssize_t ret; |
134 | 134 | ||
135 | ret = blockdev_direct_IO(rw, iocb, inode, iov, offset, nr_segs, | 135 | ret = blockdev_direct_IO(rw, iocb, inode, iter->iov, offset, |
136 | hfs_get_block); | 136 | iter->nr_segs, hfs_get_block); |
137 | 137 | ||
138 | /* | 138 | /* |
139 | * In case of error extending write may have instantiated a few | 139 | * In case of error extending write may have instantiated a few |
@@ -141,7 +141,7 @@ static ssize_t hfs_direct_IO(int rw, struct kiocb *iocb, | |||
141 | */ | 141 | */ |
142 | if (unlikely((rw & WRITE) && ret < 0)) { | 142 | if (unlikely((rw & WRITE) && ret < 0)) { |
143 | loff_t isize = i_size_read(inode); | 143 | loff_t isize = i_size_read(inode); |
144 | loff_t end = offset + iov_length(iov, nr_segs); | 144 | loff_t end = offset + iov_length(iter->iov, iter->nr_segs); |
145 | 145 | ||
146 | if (end > isize) | 146 | if (end > isize) |
147 | hfs_write_failed(mapping, end); | 147 | hfs_write_failed(mapping, end); |