d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow building without ACLs

Browse Source 
Some kernel definitions were buried inside the #if... #endif logic for
ACLs.  When ACLs are not available these definitions get lost causing
the build to fail.

Signed-off-by: Chris Wedgwood <cw@f00f.org>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #2349
This commit is contained in:
Chris Wedgwood 2014-05-26 17:09:45 -07:00 committed by Brian Behlendorf
parent 866c162340
commit 62a05896e8
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/linux/vfs_compat.h
View File

@ -250,16 +250,6 @@ zpl_forget_cached_acl(struct inode *ip, int type) {
} }
#endif /* HAVE_POSIX_ACL_RELEASE */ #endif /* HAVE_POSIX_ACL_RELEASE */
/*
* 2.6.38 API change,
* The is_owner_or_cap() function was renamed to inode_owner_or_capable().
*/
#ifdef HAVE_INODE_OWNER_OR_CAPABLE
#define zpl_inode_owner_or_capable(ip) inode_owner_or_capable(ip)
#else
#define zpl_inode_owner_or_capable(ip) is_owner_or_cap(ip)
#endif /* HAVE_INODE_OWNER_OR_CAPABLE */
#ifndef HAVE___POSIX_ACL_CHMOD #ifndef HAVE___POSIX_ACL_CHMOD
#ifdef HAVE_POSIX_ACL_CHMOD #ifdef HAVE_POSIX_ACL_CHMOD
#define __posix_acl_chmod(acl, gfp, mode) posix_acl_chmod(acl, gfp, mode) #define __posix_acl_chmod(acl, gfp, mode) posix_acl_chmod(acl, gfp, mode)
@ -311,6 +301,13 @@ __posix_acl_create(struct posix_acl **acl, int flags, umode_t *umodep) {
#endif /* HAVE_POSIX_ACL_CHMOD */ #endif /* HAVE_POSIX_ACL_CHMOD */
#endif /* HAVE___POSIX_ACL_CHMOD */ #endif /* HAVE___POSIX_ACL_CHMOD */
#ifdef HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T
typedef umode_t zpl_equivmode_t;
#else
typedef mode_t zpl_equivmode_t;
#endif /* HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T */
#endif /* CONFIG_FS_POSIX_ACL */
#ifndef HAVE_CURRENT_UMASK #ifndef HAVE_CURRENT_UMASK
static inline int static inline int
current_umask(void) current_umask(void)
@ -319,11 +316,14 @@ current_umask(void)
} }
#endif /* HAVE_CURRENT_UMASK */ #endif /* HAVE_CURRENT_UMASK */
#ifdef HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T /*
typedef umode_t zpl_equivmode_t; * 2.6.38 API change,
* The is_owner_or_cap() function was renamed to inode_owner_or_capable().
*/
#ifdef HAVE_INODE_OWNER_OR_CAPABLE
#define zpl_inode_owner_or_capable(ip) inode_owner_or_capable(ip)
#else #else
typedef mode_t zpl_equivmode_t; #define zpl_inode_owner_or_capable(ip) is_owner_or_cap(ip)
#endif /* HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T */ #endif /* HAVE_INODE_OWNER_OR_CAPABLE */
#endif /* CONFIG_FS_POSIX_ACL */
#endif /* _ZFS_VFS_H */ #endif /* _ZFS_VFS_H */