diff --git a/kmod/src/Makefile.kernelcompat b/kmod/src/Makefile.kernelcompat index 6d784f69..9c8bd9cb 100644 --- a/kmod/src/Makefile.kernelcompat +++ b/kmod/src/Makefile.kernelcompat @@ -196,16 +196,6 @@ ifneq (,$(shell grep 'struct list_lru_one \*list, spinlock_t \*lock, void \*cb_a ccflags-y += -DKC_LIST_LRU_WALK_CB_LIST_LOCK endif -# -# v3.14-rc1-7-g4e34e719e457 -# -# .set_acl callback added to struct inode_operations. Most kernels -# we target have it, but el7 (3.10 base) does not, so detect. -# -ifneq (,$(shell grep 'int ..set_acl..struct' include/linux/fs.h)) -ccflags-y += -DKC_HAS_SET_ACL -endif - # # v6.1-rc1-2-g138060ba92b3 # diff --git a/kmod/src/dir.c b/kmod/src/dir.c index f416deaa..622320c5 100644 --- a/kmod/src/dir.c +++ b/kmod/src/dir.c @@ -1979,9 +1979,7 @@ const struct inode_operations scoutfs_dir_iops = { #else .get_acl = scoutfs_get_acl, #endif -#ifdef KC_HAS_SET_ACL .set_acl = scoutfs_set_acl, -#endif .symlink = scoutfs_symlink, .permission = scoutfs_permission, .tmpfile = scoutfs_tmpfile, diff --git a/kmod/src/inode.c b/kmod/src/inode.c index 3c75fc98..9f6b55f7 100644 --- a/kmod/src/inode.c +++ b/kmod/src/inode.c @@ -150,9 +150,7 @@ static const struct inode_operations scoutfs_file_iops = { #else .get_acl = scoutfs_get_acl, #endif -#ifdef KC_HAS_SET_ACL .set_acl = scoutfs_set_acl, -#endif .fiemap = scoutfs_data_fiemap, }; @@ -165,9 +163,7 @@ static const struct inode_operations scoutfs_special_iops = { #else .get_acl = scoutfs_get_acl, #endif -#ifdef KC_HAS_SET_ACL .set_acl = scoutfs_set_acl, -#endif }; /*