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/ext2/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/ext2/inode.c')
-rw-r--r-- | fs/ext2/inode.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index b1d2a4675d42..47fbe760a7f8 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
@@ -850,18 +850,19 @@ static sector_t ext2_bmap(struct address_space *mapping, sector_t block) | |||
850 | } | 850 | } |
851 | 851 | ||
852 | static ssize_t | 852 | static ssize_t |
853 | ext2_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov, | 853 | ext2_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, |
854 | loff_t offset, unsigned long nr_segs) | 854 | loff_t offset) |
855 | { | 855 | { |
856 | struct file *file = iocb->ki_filp; | 856 | struct file *file = iocb->ki_filp; |
857 | struct address_space *mapping = file->f_mapping; | 857 | struct address_space *mapping = file->f_mapping; |
858 | struct inode *inode = mapping->host; | 858 | struct inode *inode = mapping->host; |
859 | ssize_t ret; | 859 | ssize_t ret; |
860 | 860 | ||
861 | ret = blockdev_direct_IO(rw, iocb, inode, iov, offset, nr_segs, | 861 | ret = blockdev_direct_IO(rw, iocb, inode, iter->iov, offset, |
862 | ext2_get_block); | 862 | iter->nr_segs, ext2_get_block); |
863 | if (ret < 0 && (rw & WRITE)) | 863 | if (ret < 0 && (rw & WRITE)) |
864 | ext2_write_failed(mapping, offset + iov_length(iov, nr_segs)); | 864 | ext2_write_failed(mapping, offset + |
865 | iov_length(iter->iov, iter->nr_segs)); | ||
865 | return ret; | 866 | return ret; |
866 | } | 867 | } |
867 | 868 | ||