Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

config: remove HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET 

Sponsored-by: https://despairlabs.com/sponsor/
Signed-off-by: Rob Norris <robn@despairlabs.com>
This commit is contained in:
Rob Norris 2024-08-04 14:34:02 +10:00
parent 93e14f1c33
commit ace9e5e82b
2 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,18 +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,
};
],[])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_VFS_DIRECT_IO], [ AC_DEFUN([ZFS_AC_KERNEL_VFS_DIRECT_IO], [
@ -61,23 +49,9 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_DIRECT_IO], [
AC_DEFINE(HAVE_VFS_DIRECT_IO_ITER_OFFSET, 1, AC_DEFINE(HAVE_VFS_DIRECT_IO_ITER_OFFSET, 1,
[aops->direct_IO() uses iov_iter with offset]) [aops->direct_IO() uses iov_iter with offset])
],[
AC_MSG_RESULT([no])
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]) AC_MSG_RESULT([no])
ZFS_LINUX_TEST_ERROR([direct IO]) ZFS_LINUX_TEST_ERROR([direct IO])
]) ])
]) ])
])
]) ])

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

@ -361,13 +361,6 @@ zpl_direct_IO(struct kiocb *kiocb, struct iov_iter *iter, loff_t pos)
ASSERT3S(pos, ==, kiocb->ki_pos); ASSERT3S(pos, ==, kiocb->ki_pos);
return (zpl_direct_IO_impl(iov_iter_rw(iter), kiocb, iter)); return (zpl_direct_IO_impl(iov_iter_rw(iter), kiocb, iter));
} }
#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)
{
ASSERT3S(pos, ==, kiocb->ki_pos);
return (zpl_direct_IO_impl(rw, kiocb, iter));
}
#else #else
#error "Unknown direct IO interface" #error "Unknown direct IO interface"
#endif #endif