diff --git a/kmod/src/Makefile.kernelcompat b/kmod/src/Makefile.kernelcompat index 232ef1fa..a5989ff8 100644 --- a/kmod/src/Makefile.kernelcompat +++ b/kmod/src/Makefile.kernelcompat @@ -34,16 +34,6 @@ ifneq (,$(shell grep 'static inline bool RBNAME.*_compute_max' include/linux/rbt ccflags-y += -DKC_RB_TREE_AUGMENTED_COMPUTE_MAX endif -# -# v3.13-25-g37bc15392a23 -# -# Renames posix_acl_create to __posix_acl_create and provide some -# new interfaces for creating ACLs -# -ifneq (,$(shell grep '__posix_acl_create' include/linux/posix_acl.h)) -ccflags-y += -DKC___POSIX_ACL_CREATE -endif - # # v4.8-rc1-29-g31051c85b5e2 # diff --git a/kmod/src/acl.c b/kmod/src/acl.c index c836df19..43b240f3 100644 --- a/kmod/src/acl.c +++ b/kmod/src/acl.c @@ -69,15 +69,6 @@ struct posix_acl *scoutfs_get_acl_locked(struct inode *inode, int type, struct s char *name; int ret; -#ifndef KC___POSIX_ACL_CREATE - if (!IS_POSIXACL(inode)) - return NULL; - - acl = get_cached_acl(inode, type); - if (acl != ACL_NOT_CACHED) - return acl; -#endif - ret = acl_xattr_name_len(type, &name, NULL); if (ret < 0) return ERR_PTR(ret); @@ -123,11 +114,6 @@ struct posix_acl *scoutfs_get_acl(struct inode *inode, int type) return ERR_PTR(-ECHILD); #endif -#ifndef KC___POSIX_ACL_CREATE - if (!IS_POSIXACL(inode)) - return NULL; -#endif - ret = scoutfs_lock_inode(sb, SCOUTFS_LOCK_READ, 0, inode, &lock); if (ret < 0) { acl = ERR_PTR(ret); diff --git a/kmod/src/kernelcompat.h b/kmod/src/kernelcompat.h index 0442eb04..62002611 100644 --- a/kmod/src/kernelcompat.h +++ b/kmod/src/kernelcompat.h @@ -54,11 +54,6 @@ do { \ #define setattr_prepare(dentry, attr) inode_change_ok(d_inode(dentry), attr) #endif -#ifndef KC___POSIX_ACL_CREATE -#define __posix_acl_create posix_acl_create -#define __posix_acl_chmod posix_acl_chmod -#endif - #ifndef KC_PERCPU_COUNTER_ADD_BATCH #define percpu_counter_add_batch __percpu_counter_add #endif