diff options
| author | Matus Kral <[email protected]> | 2015-05-12 01:26:18 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-06-18 12:06:59 -0700 |
| commit | 57ae840077e6c061bc57fb4860491f50b604d360 (patch) | |
| tree | 4e5a171862d5bdc2216bd19cce93e673063be8b7 /config | |
| parent | ec1c11d5ee1a90ab4d5f544143bcf5a6c2455800 (diff) | |
Linux 4.1 compat: use read_iter() / write_iter()
Linux 3.15 commit torvalds/linux@293bc98 introduced two new methods.
The ->read_iter() and ->write_iter() methods were designed to replace
the ->aio_read() and ->aio_write() interfaces. Both interfaces were
preserved for several kernel releases in order to migrate all existing
consumers to the new interfaces. But as of Linux 4.1 the legacy
interface has been retired and the ZFS code must be updated to use
the new interfaces.
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3352
Diffstat (limited to 'config')
| -rw-r--r-- | config/kernel-vfs-rw-iterate.m4 | 27 | ||||
| -rw-r--r-- | config/kernel.m4 | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/config/kernel-vfs-rw-iterate.m4 b/config/kernel-vfs-rw-iterate.m4 new file mode 100644 index 000000000..f8dc42229 --- /dev/null +++ b/config/kernel-vfs-rw-iterate.m4 @@ -0,0 +1,27 @@ +dnl # +dnl # Linux 4.1.x API +dnl # +AC_DEFUN([ZFS_AC_KERNEL_VFS_RW_ITERATE], + [AC_MSG_CHECKING([whether fops->read/write_iter() are available]) + ZFS_LINUX_TRY_COMPILE([ + #include <linux/fs.h> + + ssize_t test_read(struct kiocb *kiocb, struct iov_iter *to) + { return 0; } + ssize_t test_write(struct kiocb *kiocb, struct iov_iter *from) + { return 0; } + + static const struct file_operations + fops __attribute__ ((unused)) = { + .read_iter = test_read, + .write_iter = test_write, + }; + ],[ + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_VFS_RW_ITERATE, 1, + [fops->read/write_iter() are available]) + ],[ + AC_MSG_RESULT(no) + ]) +]) diff --git a/config/kernel.m4 b/config/kernel.m4 index a9f2f5898..fe42e171e 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -96,6 +96,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ ZFS_AC_KERNEL_5ARG_SGET ZFS_AC_KERNEL_LSEEK_EXECUTE ZFS_AC_KERNEL_VFS_ITERATE + ZFS_AC_KERNEL_VFS_RW_ITERATE AS_IF([test "$LINUX_OBJ" != "$LINUX"], [ KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ" |