diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-11-09 18:28:15 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-11-09 18:28:15 +0100 |
| commit | d72cf8ffe460824fdc97f0a9295a2c4e0231a562 (patch) | |
| tree | 1cf0d952f5066191eb9700aae882905e8546264c /fs/btrfs/ctree.h | |
| parent | KVM: x86/pmu: Limit the maximum number of supported AMD GP counters (diff) | |
| parent | KVM: s390: pci: Fix allocation size of aift kzdev elements (diff) | |
| download | linux-d72cf8ffe460824fdc97f0a9295a2c4e0231a562.tar.xz linux-d72cf8ffe460824fdc97f0a9295a2c4e0231a562.zip | |
Merge tag 'kvm-s390-master-6.1-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
A PCI allocation fix and a PV clock fix.
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 727595eee973..f677b49df8ae 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3462,7 +3462,10 @@ ssize_t btrfs_encoded_read(struct kiocb *iocb, struct iov_iter *iter, ssize_t btrfs_do_encoded_write(struct kiocb *iocb, struct iov_iter *from, const struct btrfs_ioctl_encoded_io_args *encoded); -ssize_t btrfs_dio_rw(struct kiocb *iocb, struct iov_iter *iter, size_t done_before); +ssize_t btrfs_dio_read(struct kiocb *iocb, struct iov_iter *iter, + size_t done_before); +struct iomap_dio *btrfs_dio_write(struct kiocb *iocb, struct iov_iter *iter, + size_t done_before); extern const struct dentry_operations btrfs_dentry_operations; |