diff options
| author | Omar Sandoval <osandov@osandov.com> | 2015-03-16 04:33:50 -0700 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:29:44 -0400 |
| commit | 17f8c842d24ac054e4212c82b5bd6ae455a334f3 (patch) | |
| tree | db8e5831159db867f34280200f81d4eadbec74a4 /fs/ext4 | |
| parent | bd8e0ff956456ad9071dbb6c2ed7d33bd22fc216 (diff) | |
| download | linux-17f8c842d24ac054e4212c82b5bd6ae455a334f3.tar.bz2 | |
Remove rw from {,__,do_}blockdev_direct_IO()
Most filesystems call through to these at some point, so we'll start
here.
Signed-off-by: Omar Sandoval <osandov@osandov.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/indirect.c | 11 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c index 740c7871c117..ae4ffc27abc6 100644 --- a/fs/ext4/indirect.c +++ b/fs/ext4/indirect.c @@ -693,9 +693,10 @@ retry: ret = dax_do_io(rw, iocb, inode, iter, offset, ext4_get_block, NULL, 0); else - ret = __blockdev_direct_IO(rw, iocb, inode, - inode->i_sb->s_bdev, iter, offset, - ext4_get_block, NULL, NULL, 0); + ret = __blockdev_direct_IO(iocb, inode, + inode->i_sb->s_bdev, iter, + offset, ext4_get_block, NULL, + NULL, 0); inode_dio_done(inode); } else { locked: @@ -703,8 +704,8 @@ locked: ret = dax_do_io(rw, iocb, inode, iter, offset, ext4_get_block, NULL, DIO_LOCKING); else - ret = blockdev_direct_IO(rw, iocb, inode, iter, - offset, ext4_get_block); + ret = blockdev_direct_IO(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 a3f451370bef..ec049c04b197 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3037,7 +3037,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb, ret = dax_do_io(rw, iocb, inode, iter, offset, get_block_func, ext4_end_io_dio, dio_flags); else - ret = __blockdev_direct_IO(rw, iocb, inode, + ret = __blockdev_direct_IO(iocb, inode, inode->i_sb->s_bdev, iter, offset, get_block_func, ext4_end_io_dio, NULL, dio_flags); |