aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-03-05 01:33:16 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-06 17:32:46 -0400
commit31b140398ce56ab41646eda7f02bcb78d6a4c916 (patch)
tree1cc4be44c5f94f9fe1829e5c53267f3ce9bad309 /fs/xfs
parenta6cbcd4a4a85e2fdb0b3344b88df2e8b3d526b9e (diff)
switch {__,}blockdev_direct_IO() to iov_iter
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_aops.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 6462b3186784..08d13e395252 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -1470,17 +1470,15 @@ xfs_vm_direct_IO(
1470 if (offset + size > XFS_I(inode)->i_d.di_size) 1470 if (offset + size > XFS_I(inode)->i_d.di_size)
1471 ioend->io_isdirect = 1; 1471 ioend->io_isdirect = 1;
1472 1472
1473 ret = __blockdev_direct_IO(rw, iocb, inode, bdev, iter->iov, 1473 ret = __blockdev_direct_IO(rw, iocb, inode, bdev, iter,
1474 offset, iter->nr_segs, 1474 offset, xfs_get_blocks_direct,
1475 xfs_get_blocks_direct,
1476 xfs_end_io_direct_write, NULL, 1475 xfs_end_io_direct_write, NULL,
1477 DIO_ASYNC_EXTEND); 1476 DIO_ASYNC_EXTEND);
1478 if (ret != -EIOCBQUEUED && iocb->private) 1477 if (ret != -EIOCBQUEUED && iocb->private)
1479 goto out_destroy_ioend; 1478 goto out_destroy_ioend;
1480 } else { 1479 } else {
1481 ret = __blockdev_direct_IO(rw, iocb, inode, bdev, iter->iov, 1480 ret = __blockdev_direct_IO(rw, iocb, inode, bdev, iter,
1482 offset, iter->nr_segs, 1481 offset, xfs_get_blocks_direct,
1483 xfs_get_blocks_direct,
1484 NULL, NULL, 0); 1482 NULL, NULL, 0);
1485 } 1483 }
1486 1484