diff options
| author | Chris Wedgwood <[email protected]> | 2014-05-26 17:09:45 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-05-30 12:01:57 -0700 |
| commit | 62a05896e8a438a980912236bc2b00fcce71c015 (patch) | |
| tree | 5c1847e2f3c106d0aa5dbdb506993885e91c7af8 /include | |
| parent | 866c162340f3ff3810e2c5fcfd05f95446abd6c2 (diff) | |
Allow building without ACLs
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #2349
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/vfs_compat.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/include/linux/vfs_compat.h b/include/linux/vfs_compat.h index d7d79bd26..37121b623 100644 --- a/include/linux/vfs_compat.h +++ b/include/linux/vfs_compat.h @@ -250,16 +250,6 @@ zpl_forget_cached_acl(struct inode *ip, int type) { } #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 #ifdef HAVE_POSIX_ACL_CHMOD #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 */ +#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 static inline int current_umask(void) @@ -319,11 +316,14 @@ current_umask(void) } #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 -typedef mode_t zpl_equivmode_t; -#endif /* HAVE_POSIX_ACL_EQUIV_MODE_UMODE_T */ -#endif /* CONFIG_FS_POSIX_ACL */ +#define zpl_inode_owner_or_capable(ip) is_owner_or_cap(ip) +#endif /* HAVE_INODE_OWNER_OR_CAPABLE */ #endif /* _ZFS_VFS_H */ |