diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-03-05 01:33:16 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-06 17:32:46 -0400 |
| commit | 31b140398ce56ab41646eda7f02bcb78d6a4c916 (patch) | |
| tree | 1cc4be44c5f94f9fe1829e5c53267f3ce9bad309 /fs/ext4 | |
| parent | a6cbcd4a4a85e2fdb0b3344b88df2e8b3d526b9e (diff) | |
| download | blackbird-op-linux-31b140398ce56ab41646eda7f02bcb78d6a4c916.tar.gz blackbird-op-linux-31b140398ce56ab41646eda7f02bcb78d6a4c916.zip | |
switch {__,}blockdev_direct_IO() to iov_iter
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/indirect.c | 7 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c index 123898a6af05..8a57e9fcd1b9 100644 --- a/fs/ext4/indirect.c +++ b/fs/ext4/indirect.c @@ -686,14 +686,13 @@ retry: goto locked; } ret = __blockdev_direct_IO(rw, iocb, inode, - inode->i_sb->s_bdev, iter->iov, - offset, iter->nr_segs, + inode->i_sb->s_bdev, iter, offset, ext4_get_block, NULL, NULL, 0); inode_dio_done(inode); } else { locked: - ret = blockdev_direct_IO(rw, iocb, inode, iter->iov, - offset, iter->nr_segs, ext4_get_block); + ret = blockdev_direct_IO(rw, iocb, inode, iter, + offset, ext4_get_block); if (unlikely((rw & WRITE) && ret < 0)) { loff_t isize = i_size_read(inode); diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 2b993579a968..e5718385a037 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3166,8 +3166,8 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb, dio_flags = DIO_LOCKING; } ret = __blockdev_direct_IO(rw, iocb, inode, - inode->i_sb->s_bdev, iter->iov, - offset, iter->nr_segs, + inode->i_sb->s_bdev, iter, + offset, get_block_func, ext4_end_io_dio, NULL, |
