From e7c8881ca4cff234a1f90e930e12140692756bc2 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Thu, 20 Nov 2025 11:07:03 -0800 Subject: [PATCH] Remove KC_XATTR_HANDLER_NAME compat for el7 Every kernel now supports .name instead of .prefix. Signed-off-by: Auke Kok --- kmod/src/Makefile.kernelcompat | 10 ---------- kmod/src/xattr.c | 8 -------- 2 files changed, 18 deletions(-) diff --git a/kmod/src/Makefile.kernelcompat b/kmod/src/Makefile.kernelcompat index ed215c1d..da99df8e 100644 --- a/kmod/src/Makefile.kernelcompat +++ b/kmod/src/Makefile.kernelcompat @@ -6,16 +6,6 @@ ccflags-y += -include $(src)/kernelcompat.h -# -# v4.4-rc4-4-g98e9cb5711c6 -# -# Introduces a new xattr_handler .name member that can be used to match the -# entire field, instead of just a prefix. For these kernels, we must use -# the new .name field instead. -ifneq (,$(shell grep 'static inline const char .xattr_prefix' include/linux/xattr.h)) -ccflags-y += -DKC_XATTR_HANDLER_NAME=1 -endif - # # v5.19-rc4-96-g342a72a33407 # diff --git a/kmod/src/xattr.c b/kmod/src/xattr.c index f6197c82..4ac83cad 100644 --- a/kmod/src/xattr.c +++ b/kmod/src/xattr.c @@ -1045,22 +1045,14 @@ static const struct xattr_handler scoutfs_xattr_security_handler = { }; static const struct xattr_handler scoutfs_xattr_acl_access_handler = { -#ifdef KC_XATTR_HANDLER_NAME .name = XATTR_NAME_POSIX_ACL_ACCESS, -#else - .prefix = XATTR_NAME_POSIX_ACL_ACCESS, -#endif .flags = ACL_TYPE_ACCESS, .get = scoutfs_acl_get_xattr, .set = scoutfs_acl_set_xattr, }; static const struct xattr_handler scoutfs_xattr_acl_default_handler = { -#ifdef KC_XATTR_HANDLER_NAME .name = XATTR_NAME_POSIX_ACL_DEFAULT, -#else - .prefix = XATTR_NAME_POSIX_ACL_DEFAULT, -#endif .flags = ACL_TYPE_DEFAULT, .get = scoutfs_acl_get_xattr, .set = scoutfs_acl_set_xattr,