diff options
| author | Coleman Kane <[email protected]> | 2023-08-07 18:47:46 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2023-09-19 08:50:01 -0700 |
| commit | 5a22de144abf2829bc8112e17a7a7e542da53dc5 (patch) | |
| tree | 84ab6874618c9c853c9eab588009e9c994f96105 /module/os/linux/zfs | |
| parent | 31a4673c05ea942498a278d9dd519f251b501db1 (diff) | |
Linux 6.5 compat: replace generic_file_splice_read with filemap_splice_read
The generic_file_splice_read function was removed in Linux 6.5 in favor
of filemap_splice_read. Add an autoconf test for filemap_splice_read and
use it if it is found as the handler for .splice_read in the
file_operations struct. Additionally, ITER_PIPE was removed in 6.5. This
change removes the ITER_* macros that OpenZFS doesn't use from being
tested in config/kernel-vfs-iov_iter.m4. The removal of ITER_PIPE was
causing the test to fail, which also affected the code responsible for
setting the .splice_read handler, above. That behavior caused run-time
panics on Linux 6.5.
Reviewed-by: Brian Atkinson <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Coleman Kane <[email protected]>
Closes #15155
Diffstat (limited to 'module/os/linux/zfs')
| -rw-r--r-- | module/os/linux/zfs/zpl_file.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/module/os/linux/zfs/zpl_file.c b/module/os/linux/zfs/zpl_file.c index f6af2ebd1..24cc1064a 100644 --- a/module/os/linux/zfs/zpl_file.c +++ b/module/os/linux/zfs/zpl_file.c @@ -1323,7 +1323,11 @@ const struct file_operations zpl_file_operations = { .read_iter = zpl_iter_read, .write_iter = zpl_iter_write, #ifdef HAVE_VFS_IOV_ITER +#ifdef HAVE_FILEMAP_SPLICE_READ + .splice_read = filemap_splice_read, +#else .splice_read = generic_file_splice_read, +#endif .splice_write = iter_file_splice_write, #endif #else |