c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-17 01:51:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

config: remove HAVE_USER_NS_COMMON_INUM

Browse Source 
Sponsored-by: https://despairlabs.com/sponsor/
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Tino Reichardt <milky-zfs@mcmilk.de>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Closes #16479
This commit is contained in:
Rob Norris 2024-08-04 10:26:48 +10:00 committed by Brian Behlendorf
parent b545b07b2f
commit f3d30f1ce0
3 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
config/kernel-user-ns-inum.m4
View File

@ -1,23 +0,0 @@
dnl #
dnl # 3.18 API change
dnl # struct user_namespace inum moved from .proc_inum to .ns.inum.
dnl #
AC_DEFUN([ZFS_AC_KERNEL_SRC_USER_NS_COMMON_INUM], [
ZFS_LINUX_TEST_SRC([user_ns_common_inum], [
#include <linux/user_namespace.h>
], [
struct user_namespace uns;
uns.ns.inum = 0;
])
])
AC_DEFUN([ZFS_AC_KERNEL_USER_NS_COMMON_INUM], [
AC_MSG_CHECKING([whether user_namespace->ns.inum exists])
ZFS_LINUX_TEST_RESULT([user_ns_common_inum], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_USER_NS_COMMON_INUM, 1,
[user_namespace->ns.inum exists])
],[
AC_MSG_RESULT(no)
])
])

2
config/kernel.m4
View File

@ -146,7 +146,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [
ZFS_AC_KERNEL_SRC_KTHREAD ZFS_AC_KERNEL_SRC_KTHREAD
ZFS_AC_KERNEL_SRC_ZERO_PAGE ZFS_AC_KERNEL_SRC_ZERO_PAGE
ZFS_AC_KERNEL_SRC___COPY_FROM_USER_INATOMIC ZFS_AC_KERNEL_SRC___COPY_FROM_USER_INATOMIC
ZFS_AC_KERNEL_SRC_USER_NS_COMMON_INUM
ZFS_AC_KERNEL_SRC_IDMAP_MNT_API ZFS_AC_KERNEL_SRC_IDMAP_MNT_API
ZFS_AC_KERNEL_SRC_IDMAP_NO_USERNS ZFS_AC_KERNEL_SRC_IDMAP_NO_USERNS
ZFS_AC_KERNEL_SRC_IATTR_VFSID ZFS_AC_KERNEL_SRC_IATTR_VFSID
@ -288,7 +287,6 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [
ZFS_AC_KERNEL_KTHREAD ZFS_AC_KERNEL_KTHREAD
ZFS_AC_KERNEL_ZERO_PAGE ZFS_AC_KERNEL_ZERO_PAGE
ZFS_AC_KERNEL___COPY_FROM_USER_INATOMIC ZFS_AC_KERNEL___COPY_FROM_USER_INATOMIC
ZFS_AC_KERNEL_USER_NS_COMMON_INUM
ZFS_AC_KERNEL_IDMAP_MNT_API ZFS_AC_KERNEL_IDMAP_MNT_API
ZFS_AC_KERNEL_IDMAP_NO_USERNS ZFS_AC_KERNEL_IDMAP_NO_USERNS
ZFS_AC_KERNEL_IATTR_VFSID ZFS_AC_KERNEL_IATTR_VFSID

20
module/os/linux/spl/spl-zone.c
View File

@ -54,7 +54,7 @@ typedef struct zone_dataset {
char zd_dsname[]; /* name of the member dataset */ char zd_dsname[]; /* name of the member dataset */
} zone_dataset_t; } zone_dataset_t;
#if defined(CONFIG_USER_NS) && defined(HAVE_USER_NS_COMMON_INUM) #ifdef CONFIG_USER_NS
/* /*
* Returns: * Returns:
* - 0 on success * - 0 on success
@ -95,18 +95,14 @@ done:
return (error); return (error);
} }
#endif /* defined(CONFIG_USER_NS) && defined(HAVE_USER_NS_COMMON_INUM) */ #endif /* CONFIG_USER_NS */
static unsigned int static unsigned int
user_ns_zoneid(struct user_namespace *user_ns) user_ns_zoneid(struct user_namespace *user_ns)
{ {
unsigned int r; unsigned int r;
#if defined(HAVE_USER_NS_COMMON_INUM)
r = user_ns->ns.inum; r = user_ns->ns.inum;
#else
r = user_ns->proc_inum;
#endif
return (r); return (r);
} }
@ -123,7 +119,7 @@ zone_datasets_lookup(unsigned int nsinum)
return (NULL); return (NULL);
} }
#if defined(CONFIG_USER_NS) && defined(HAVE_USER_NS_COMMON_INUM) #ifdef CONFIG_USER_NS
static struct zone_dataset * static struct zone_dataset *
zone_dataset_lookup(zone_datasets_t *zds, const char *dataset, size_t dsnamelen) zone_dataset_lookup(zone_datasets_t *zds, const char *dataset, size_t dsnamelen)
{ {
@ -148,7 +144,7 @@ zone_dataset_cred_check(cred_t *cred)
return (0); return (0);
} }
#endif /* defined(CONFIG_USER_NS) && defined(HAVE_USER_NS_COMMON_INUM) */ #endif /* CONFIG_USER_NS */
static int static int
zone_dataset_name_check(const char *dataset, size_t *dsnamelen) zone_dataset_name_check(const char *dataset, size_t *dsnamelen)
@ -168,7 +164,7 @@ zone_dataset_name_check(const char *dataset, size_t *dsnamelen)
int int
zone_dataset_attach(cred_t *cred, const char *dataset, int userns_fd) zone_dataset_attach(cred_t *cred, const char *dataset, int userns_fd)
{ {
#if defined(CONFIG_USER_NS) && defined(HAVE_USER_NS_COMMON_INUM) #ifdef CONFIG_USER_NS
struct user_namespace *userns; struct user_namespace *userns;
zone_datasets_t *zds; zone_datasets_t *zds;
zone_dataset_t *zd; zone_dataset_t *zd;
@ -213,14 +209,14 @@ zone_dataset_attach(cred_t *cred, const char *dataset, int userns_fd)
return (0); return (0);
#else #else
return (ENXIO); return (ENXIO);
#endif /* defined(CONFIG_USER_NS) && defined(HAVE_USER_NS_COMMON_INUM) */ #endif /* CONFIG_USER_NS */
} }
EXPORT_SYMBOL(zone_dataset_attach); EXPORT_SYMBOL(zone_dataset_attach);
int int
zone_dataset_detach(cred_t *cred, const char *dataset, int userns_fd) zone_dataset_detach(cred_t *cred, const char *dataset, int userns_fd)
{ {
#if defined(CONFIG_USER_NS) && defined(HAVE_USER_NS_COMMON_INUM) #ifdef CONFIG_USER_NS
struct user_namespace *userns; struct user_namespace *userns;
zone_datasets_t *zds; zone_datasets_t *zds;
zone_dataset_t *zd; zone_dataset_t *zd;
@ -262,7 +258,7 @@ zone_dataset_detach(cred_t *cred, const char *dataset, int userns_fd)
return (0); return (0);
#else #else
return (ENXIO); return (ENXIO);
#endif /* defined(CONFIG_USER_NS) && defined(HAVE_USER_NS_COMMON_INUM) */ #endif /* CONFIG_USER_NS */
} }
EXPORT_SYMBOL(zone_dataset_detach); EXPORT_SYMBOL(zone_dataset_detach);