diff options
| author | Omar Sandoval <osandov@osandov.com> | 2015-03-16 04:33:51 -0700 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-04-11 22:29:44 -0400 |
| commit | a95cd6311512bd954e88684eb39373f7f4b0a984 (patch) | |
| tree | 88cb744c8ca017a9f53a337b3739c989273b98f6 /fs/ext4 | |
| parent | 17f8c842d24ac054e4212c82b5bd6ae455a334f3 (diff) | |
| download | linux-stable-a95cd6311512bd954e88684eb39373f7f4b0a984.tar.gz linux-stable-a95cd6311512bd954e88684eb39373f7f4b0a984.tar.bz2 linux-stable-a95cd6311512bd954e88684eb39373f7f4b0a984.zip | |
Remove rw from dax_{do_,}io()
And use iov_iter_rw() instead.
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 | 4 | ||||
| -rw-r--r-- | fs/ext4/inode.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c index ae4ffc27abc6..cd81d01da0b0 100644 --- a/fs/ext4/indirect.c +++ b/fs/ext4/indirect.c @@ -690,7 +690,7 @@ retry: goto locked; } if (IS_DAX(inode)) - ret = dax_do_io(rw, iocb, inode, iter, offset, + ret = dax_do_io(iocb, inode, iter, offset, ext4_get_block, NULL, 0); else ret = __blockdev_direct_IO(iocb, inode, @@ -701,7 +701,7 @@ retry: } else { locked: if (IS_DAX(inode)) - ret = dax_do_io(rw, iocb, inode, iter, offset, + ret = dax_do_io(iocb, inode, iter, offset, ext4_get_block, NULL, DIO_LOCKING); else ret = blockdev_direct_IO(iocb, inode, iter, offset, diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index ec049c04b197..76b8cba5d041 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3034,7 +3034,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb, dio_flags = DIO_LOCKING; } if (IS_DAX(inode)) - ret = dax_do_io(rw, iocb, inode, iter, offset, get_block_func, + ret = dax_do_io(iocb, inode, iter, offset, get_block_func, ext4_end_io_dio, dio_flags); else ret = __blockdev_direct_IO(iocb, inode, |