diff options
| author | Antonio Russo <[email protected]> | 2022-12-31 07:51:32 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2023-01-06 14:33:00 -0800 |
| commit | d27c81847b43584483b5509ff352e7e727b0ce87 (patch) | |
| tree | 15b517ee87fe1b5d57eaa7356405ffb7ab843496 /config/kernel-tmpfile.m4 | |
| parent | a7304ab9c1ea62c556aa7d007821322afc75ff79 (diff) | |
Linux 6.1 compat: open inside tmpfile()
Linux 863f144 modified the .tmpfile interface to pass a struct file,
rather than a struct dentry, and expect the tmpfile implementation to
open inside of tmpfile().
This patch implements a configuration test that checks for this new API
and appropriately sets a HAVE_TMPFILE_DENTRY flag that tracks this old
API. Contingent on this flag, the appropriate API is implemented.
Reviewed-by: Richard Yao <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Antonio Russo <[email protected]>
Closes #14301
Closes #14343
Diffstat (limited to 'config/kernel-tmpfile.m4')
| -rw-r--r-- | config/kernel-tmpfile.m4 | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/config/kernel-tmpfile.m4 b/config/kernel-tmpfile.m4 index 45c2e6cee..acb7ea1e8 100644 --- a/config/kernel-tmpfile.m4 +++ b/config/kernel-tmpfile.m4 @@ -4,10 +4,24 @@ dnl # Add support for i_op->tmpfile dnl # AC_DEFUN([ZFS_AC_KERNEL_SRC_TMPFILE], [ dnl # + dnl # 6.1 API change + dnl # use struct file instead of struct dentry + dnl # + ZFS_LINUX_TEST_SRC([inode_operations_tmpfile], [ + #include <linux/fs.h> + int tmpfile(struct user_namespace *userns, + struct inode *inode, struct file *file, + umode_t mode) { return 0; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .tmpfile = tmpfile, + }; + ],[]) + dnl # dnl # 5.11 API change dnl # add support for userns parameter to tmpfile dnl # - ZFS_LINUX_TEST_SRC([inode_operations_tmpfile_userns], [ + ZFS_LINUX_TEST_SRC([inode_operations_tmpfile_dentry_userns], [ #include <linux/fs.h> int tmpfile(struct user_namespace *userns, struct inode *inode, struct dentry *dentry, @@ -17,7 +31,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_TMPFILE], [ .tmpfile = tmpfile, }; ],[]) - ZFS_LINUX_TEST_SRC([inode_operations_tmpfile], [ + ZFS_LINUX_TEST_SRC([inode_operations_tmpfile_dentry], [ #include <linux/fs.h> int tmpfile(struct inode *inode, struct dentry *dentry, umode_t mode) { return 0; } @@ -30,16 +44,24 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_TMPFILE], [ AC_DEFUN([ZFS_AC_KERNEL_TMPFILE], [ AC_MSG_CHECKING([whether i_op->tmpfile() exists]) - ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile_userns], [ + ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile], [ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_TMPFILE, 1, [i_op->tmpfile() exists]) AC_DEFINE(HAVE_TMPFILE_USERNS, 1, [i_op->tmpfile() has userns]) ],[ - ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile], [ + ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile_dentry_userns], [ AC_MSG_RESULT(yes) AC_DEFINE(HAVE_TMPFILE, 1, [i_op->tmpfile() exists]) + AC_DEFINE(HAVE_TMPFILE_USERNS, 1, [i_op->tmpfile() has userns]) + AC_DEFINE(HAVE_TMPFILE_DENTRY, 1, [i_op->tmpfile() uses old dentry signature]) ],[ - AC_MSG_RESULT(no) + ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile_dentry], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_TMPFILE, 1, [i_op->tmpfile() exists]) + AC_DEFINE(HAVE_TMPFILE_DENTRY, 1, [i_op->tmpfile() uses old dentry signature]) + ],[ + AC_MSG_RESULT(no) + ]) ]) ]) ]) |