From fcf94498fbfd7f8b1ae3e4ed1310ca113828078a Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 13 Nov 2025 11:49:36 -0800 Subject: [PATCH] Remove kc_posix_acl_valid compat. This is a pre-el7 remnant, possibly from a really old rhel9 version, and was already effectively a stub. Signed-off-by: Auke Kok --- kmod/src/Makefile.kernelcompat | 9 --------- kmod/src/acl.c | 2 +- kmod/src/kernelcompat.h | 6 ------ 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/kmod/src/Makefile.kernelcompat b/kmod/src/Makefile.kernelcompat index 43c6d1c9..96d2dd58 100644 --- a/kmod/src/Makefile.kernelcompat +++ b/kmod/src/Makefile.kernelcompat @@ -6,15 +6,6 @@ ccflags-y += -include $(src)/kernelcompat.h -# -# v4.7-rc2-23-g0d4d717f2583 -# -# Added user_ns argument to posix_acl_valid -# -ifneq (,$(shell grep 'posix_acl_valid.*user_namespace' include/linux/posix_acl.h)) -ccflags-y += -DKC_POSIX_ACL_VALID_USER_NS -endif - # # v5.3-12296-g6d2052d188d9 # diff --git a/kmod/src/acl.c b/kmod/src/acl.c index 43b240f3..f393d9af 100644 --- a/kmod/src/acl.c +++ b/kmod/src/acl.c @@ -287,7 +287,7 @@ int scoutfs_acl_set_xattr(struct dentry *dentry, const char *name, const void *v return PTR_ERR(acl); if (acl) { - ret = kc_posix_acl_valid(&init_user_ns, acl); + ret = posix_acl_valid(&init_user_ns, acl); if (ret) goto out; } diff --git a/kmod/src/kernelcompat.h b/kmod/src/kernelcompat.h index 3109e1e0..cecd8359 100644 --- a/kmod/src/kernelcompat.h +++ b/kmod/src/kernelcompat.h @@ -29,12 +29,6 @@ do { \ }) #endif -#ifdef KC_POSIX_ACL_VALID_USER_NS -#define kc_posix_acl_valid(user_ns, acl) posix_acl_valid(user_ns, acl) -#else -#define kc_posix_acl_valid(user_ns, acl) posix_acl_valid(acl) -#endif - /* * v3.6-rc1-24-gdbf2576e37da *