c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-02-07 07:43:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

config: remove HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET

Browse Source 
Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #16479
This commit is contained in:
Rob Norris 2024-08-04 14:34:02 +10:00 committed by Tony Hutter
parent 92eeeba665
commit 8ae3b6b675
2 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
config/kernel-vfs-direct_IO.m4
View File

@ -25,31 +25,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_DIRECT_IO], [
.direct_IO = test_direct_IO, .direct_IO = test_direct_IO,
}; };
],[]) ],[])
ZFS_LINUX_TEST_SRC([direct_io_iter_rw_offset], [
#include <linux/fs.h>
static ssize_t test_direct_IO(int rw, struct kiocb *kiocb,
struct iov_iter *iter, loff_t offset) { return 0; }
static const struct address_space_operations
aops __attribute__ ((unused)) = {
.direct_IO = test_direct_IO,
};
],[])
ZFS_LINUX_TEST_SRC([direct_io_iovec], [
#include <linux/fs.h>
static ssize_t test_direct_IO(int rw, struct kiocb *kiocb,
const struct iovec *iov, loff_t offset,
unsigned long nr_segs) { return 0; }
static const struct address_space_operations
aops __attribute__ ((unused)) = {
.direct_IO = test_direct_IO,
};
],[])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_VFS_DIRECT_IO], [ AC_DEFUN([ZFS_AC_KERNEL_VFS_DIRECT_IO], [
@ -76,34 +51,7 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_DIRECT_IO], [
],[ ],[
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ZFS_LINUX_TEST_ERROR([Direct I/O])
dnl #
dnl # Linux 3.16.x API change
dnl #
AC_MSG_CHECKING(
[whether aops->direct_IO() uses rw and offset])
ZFS_LINUX_TEST_RESULT([direct_io_iter_rw_offset], [
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET, 1,
[aops->direct_IO() uses iov_iter with ]
[rw and offset])
],[
AC_MSG_RESULT([no])
dnl #
dnl # Ancient Linux API (predates git)
dnl #
AC_MSG_CHECKING(
[whether aops->direct_IO() uses iovec])
ZFS_LINUX_TEST_RESULT([direct_io_iovec], [
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_VFS_DIRECT_IO_IOVEC, 1,
[aops->direct_IO() uses iovec])
],[
ZFS_LINUX_TEST_ERROR([direct IO])
AC_MSG_RESULT([no])
])
])
]) ])
]) ])
]) ])

6
module/os/linux/zfs/zpl_file.c
View File

@ -365,12 +365,6 @@ zpl_direct_IO(struct kiocb *kiocb, struct iov_iter *iter, loff_t pos)
{ {
return (zpl_direct_IO_impl()); return (zpl_direct_IO_impl());
} }
#elif defined(HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET)
static ssize_t
zpl_direct_IO(int rw, struct kiocb *kiocb, struct iov_iter *iter, loff_t pos)
{
return (zpl_direct_IO_impl());
}
#else #else
#error "Unknown Direct I/O interface" #error "Unknown Direct I/O interface"
#endif #endif