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

Linux 5.16 compat: Added mapping for iov_iter_fault_in_readable 

Linux decided to rename this for some reason. At some point, we
should probably invert this mapping, but for now...

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Coleman Kane <ckane@colemankane.org>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes #12975
This commit is contained in:
Rich Ercolani 2022-01-14 05:07:33 -05:00 committed by Tony Hutter
parent c31c1146b6
commit 70b7b1975d
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/kernel-add-disk.m4
View File

@ -13,7 +13,6 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_ADD_DISK], [
]) ])
]) ])
AC_DEFUN([ZFS_AC_KERNEL_ADD_DISK], [ AC_DEFUN([ZFS_AC_KERNEL_ADD_DISK], [
AC_MSG_CHECKING([whether add_disk() returns int]) AC_MSG_CHECKING([whether add_disk() returns int])
ZFS_LINUX_TEST_RESULT([add_disk_ret], ZFS_LINUX_TEST_RESULT([add_disk_ret],

22
config/kernel-vfs-iov_iter.m4
View File

@ -41,6 +41,17 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_VFS_IOV_ITER], [
error = iov_iter_fault_in_readable(&iter, size); error = iov_iter_fault_in_readable(&iter, size);
]) ])
ZFS_LINUX_TEST_SRC([fault_in_iov_iter_readable], [
#include <linux/fs.h>
#include <linux/uio.h>
],[
struct iov_iter iter = { 0 };
size_t size = 512;
int error __attribute__ ((unused));
error = fault_in_iov_iter_readable(&iter, size);
])
ZFS_LINUX_TEST_SRC([iov_iter_count], [ ZFS_LINUX_TEST_SRC([iov_iter_count], [
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/uio.h> #include <linux/uio.h>
@ -123,8 +134,15 @@ AC_DEFUN([ZFS_AC_KERNEL_VFS_IOV_ITER], [
AC_DEFINE(HAVE_IOV_ITER_FAULT_IN_READABLE, 1, AC_DEFINE(HAVE_IOV_ITER_FAULT_IN_READABLE, 1,
[iov_iter_fault_in_readable() is available]) [iov_iter_fault_in_readable() is available])
],[ ],[
AC_MSG_RESULT(no) AC_MSG_CHECKING([whether fault_in_iov_iter_readable() is available])
enable_vfs_iov_iter="no" ZFS_LINUX_TEST_RESULT([fault_in_iov_iter_readable], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_FAULT_IN_IOV_ITER_READABLE, 1,
[fault_in_iov_iter_readable() is available])
],[
AC_MSG_RESULT(no)
enable_vfs_iov_iter="no"
])
]) ])
AC_MSG_CHECKING([whether iov_iter_count() is available]) AC_MSG_CHECKING([whether iov_iter_count() is available])

4
include/os/linux/spl/sys/uio.h
View File

@ -34,6 +34,10 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <sys/types.h> #include <sys/types.h>
#if defined(HAVE_VFS_IOV_ITER) && defined(HAVE_FAULT_IN_IOV_ITER_READABLE)
#define iov_iter_fault_in_readable(a, b) fault_in_iov_iter_readable(a, b)
#endif
typedef struct iovec iovec_t; typedef struct iovec iovec_t;
typedef enum zfs_uio_rw { typedef enum zfs_uio_rw {