diff options
author | Christoph Hellwig <hch@lst.de> | 2016-04-07 11:51:58 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-01 19:58:39 -0400 |
commit | c8b8e32d700fe943a935e435ae251364d016c497 (patch) | |
tree | 956e582a123c6b2761e80901bdaaedc5ba4137e3 /fs/btrfs/inode.c | |
parent | 13712713caba0c1b8c2c0070a4c1f4487def8dee (diff) |
direct-io: eliminate the offset argument to ->direct_IO
Including blkdev_direct_IO and dax_do_io. It has to be ki_pos to actually
work, so eliminate the superflous argument.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 2aaba58b4856..352d4e1dc985 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c | |||
@@ -8541,13 +8541,13 @@ out: | |||
8541 | return retval; | 8541 | return retval; |
8542 | } | 8542 | } |
8543 | 8543 | ||
8544 | static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, | 8544 | static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) |
8545 | loff_t offset) | ||
8546 | { | 8545 | { |
8547 | struct file *file = iocb->ki_filp; | 8546 | struct file *file = iocb->ki_filp; |
8548 | struct inode *inode = file->f_mapping->host; | 8547 | struct inode *inode = file->f_mapping->host; |
8549 | struct btrfs_root *root = BTRFS_I(inode)->root; | 8548 | struct btrfs_root *root = BTRFS_I(inode)->root; |
8550 | struct btrfs_dio_data dio_data = { 0 }; | 8549 | struct btrfs_dio_data dio_data = { 0 }; |
8550 | loff_t offset = iocb->ki_pos; | ||
8551 | size_t count = 0; | 8551 | size_t count = 0; |
8552 | int flags = 0; | 8552 | int flags = 0; |
8553 | bool wakeup = true; | 8553 | bool wakeup = true; |
@@ -8607,7 +8607,7 @@ static ssize_t btrfs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, | |||
8607 | 8607 | ||
8608 | ret = __blockdev_direct_IO(iocb, inode, | 8608 | ret = __blockdev_direct_IO(iocb, inode, |
8609 | BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev, | 8609 | BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev, |
8610 | iter, offset, btrfs_get_blocks_direct, NULL, | 8610 | iter, btrfs_get_blocks_direct, NULL, |
8611 | btrfs_submit_direct, flags); | 8611 | btrfs_submit_direct, flags); |
8612 | if (iov_iter_rw(iter) == WRITE) { | 8612 | if (iov_iter_rw(iter) == WRITE) { |
8613 | current->journal_info = NULL; | 8613 | current->journal_info = NULL; |