diff options
| author | Rich Ercolani <[email protected]> | 2021-05-20 19:02:36 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2021-05-27 22:31:56 -0700 |
| commit | ab6717cba6eb3516c499ae223d05c26df57dc4d7 (patch) | |
| tree | 4409056fa9a24742cfbabb4b3823764a638097d2 /config | |
| parent | 33a06f27e65d0976ed227ea4af417d71d1c4a964 (diff) | |
Update tmpfile() existence detection
Linux changed the tmpfile() signature again in torvalds/linux@6521f89,
which in turn broke our HAVE_TMPFILE detection in configure.
Update that macro to include the new case, and change the signature of
zpl_tmpfile as appropriate.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Rich Ercolani <[email protected]>
Closes: #12060
Closes: #12087
Diffstat (limited to 'config')
| -rw-r--r-- | config/kernel-tmpfile.m4 | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/config/kernel-tmpfile.m4 b/config/kernel-tmpfile.m4 index f510bfe6b..45c2e6cee 100644 --- a/config/kernel-tmpfile.m4 +++ b/config/kernel-tmpfile.m4 @@ -3,23 +3,43 @@ dnl # 3.11 API change dnl # Add support for i_op->tmpfile dnl # AC_DEFUN([ZFS_AC_KERNEL_SRC_TMPFILE], [ - ZFS_LINUX_TEST_SRC([inode_operations_tmpfile], [ + dnl # + dnl # 5.11 API change + dnl # add support for userns parameter to tmpfile + dnl # + ZFS_LINUX_TEST_SRC([inode_operations_tmpfile_userns], [ #include <linux/fs.h> - int tmpfile(struct inode *inode, struct dentry *dentry, + int tmpfile(struct user_namespace *userns, + struct inode *inode, struct dentry *dentry, umode_t mode) { return 0; } static struct inode_operations iops __attribute__ ((unused)) = { .tmpfile = tmpfile, }; ],[]) + ZFS_LINUX_TEST_SRC([inode_operations_tmpfile], [ + #include <linux/fs.h> + int tmpfile(struct inode *inode, struct dentry *dentry, + umode_t mode) { return 0; } + static struct inode_operations + iops __attribute__ ((unused)) = { + .tmpfile = tmpfile, + }; + ],[]) ]) AC_DEFUN([ZFS_AC_KERNEL_TMPFILE], [ AC_MSG_CHECKING([whether i_op->tmpfile() exists]) - ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile], [ + ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile_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_MSG_RESULT(no) + ZFS_LINUX_TEST_RESULT([inode_operations_tmpfile], [ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_TMPFILE, 1, [i_op->tmpfile() exists]) + ],[ + AC_MSG_RESULT(no) + ]) ]) ]) |