diff options
Diffstat (limited to 'include/linux/vfs_compat.h')
| -rw-r--r-- | include/linux/vfs_compat.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h index fa12ba95a..52c539933 100644 --- a/include/linux/vfs_compat.h +++ b/include/linux/vfs_compat.h @@ -203,9 +203,6 @@ lseek_execute( * At 60 seconds the kernel will also begin issuing RCU stall warnings. */ #include <linux/posix_acl.h> -#ifndef HAVE_POSIX_ACL_CACHING -#define ACL_NOT_CACHED ((void *)(-1)) -#endif /* HAVE_POSIX_ACL_CACHING */ #if defined(HAVE_POSIX_ACL_RELEASE) && !defined(HAVE_POSIX_ACL_RELEASE_GPL_ONLY) @@ -234,7 +231,6 @@ zpl_posix_acl_release(struct posix_acl *acl) static inline void zpl_set_cached_acl(struct inode *ip, int type, struct posix_acl *newer) { -#ifdef HAVE_POSIX_ACL_CACHING struct posix_acl *older = NULL; spin_lock(&ip->i_lock); @@ -256,7 +252,6 @@ zpl_set_cached_acl(struct inode *ip, int type, struct posix_acl *newer) { spin_unlock(&ip->i_lock); zpl_posix_acl_release(older); -#endif /* HAVE_POSIX_ACL_CACHING */ } static inline void @@ -323,14 +318,6 @@ typedef mode_t zpl_equivmode_t; #endif /* HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T */ #endif /* CONFIG_FS_POSIX_ACL */ -#ifndef HAVE_CURRENT_UMASK -static inline int -current_umask(void) -{ - return (current->fs->umask); -} -#endif /* HAVE_CURRENT_UMASK */ - /* * 2.6.38 API change, * The is_owner_or_cap() function was renamed to inode_owner_or_capable(). |