diff options
| -rw-r--r-- | config/kernel-tmpfile.m4 | 28 | ||||
| -rw-r--r-- | module/os/linux/zfs/zpl_inode.c | 5 |
2 files changed, 29 insertions, 4 deletions
diff --git a/config/kernel-tmpfile.m4 b/config/kernel-tmpfile.m4 index f510bfe6ba03..45c2e6ceea52 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) + ]) ]) ]) diff --git a/module/os/linux/zfs/zpl_inode.c b/module/os/linux/zfs/zpl_inode.c index 79d5a605bf4d..98c2fb3a0c92 100644 --- a/module/os/linux/zfs/zpl_inode.c +++ b/module/os/linux/zfs/zpl_inode.c @@ -224,7 +224,12 @@ zpl_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, #ifdef HAVE_TMPFILE static int +#ifdef HAVE_TMPFILE_USERNS +zpl_tmpfile(struct user_namespace *userns, struct inode *dir, + struct dentry *dentry, umode_t mode) +#else zpl_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) +#endif { cred_t *cr = CRED(); struct inode *ip; |