pass iov_iter to ->direct_IO()

unmodified, for now

Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
Al Viro 2014-03-04 21:27:34 -05:00
commit d8d3d94b80
30 changed files with 117 additions and 126 deletions

View file

@ -331,15 +331,15 @@ static sector_t jfs_bmap(struct address_space *mapping, sector_t block)
}
static ssize_t jfs_direct_IO(int rw, struct kiocb *iocb,
const struct iovec *iov, loff_t offset, unsigned long nr_segs)
struct iov_iter *iter, loff_t offset)
{
struct file *file = iocb->ki_filp;
struct address_space *mapping = file->f_mapping;
struct inode *inode = file->f_mapping->host;
ssize_t ret;
ret = blockdev_direct_IO(rw, iocb, inode, iov, offset, nr_segs,
jfs_get_block);
ret = blockdev_direct_IO(rw, iocb, inode, iter->iov, offset,
iter->nr_segs, jfs_get_block);
/*
* In case of error extending write may have instantiated a few
@ -347,7 +347,7 @@ static ssize_t jfs_direct_IO(int rw, struct kiocb *iocb,
*/
if (unlikely((rw & WRITE) && ret < 0)) {
loff_t isize = i_size_read(inode);
loff_t end = offset + iov_length(iov, nr_segs);
loff_t end = offset + iov_length(iter->iov, iter->nr_segs);
if (end > isize)
jfs_write_failed(mapping, end);