diff options
| author | James Morris <jmorris@namei.org> | 2011-09-15 09:53:38 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-09-15 09:53:38 +1000 |
| commit | 8de6ac7f58a22fdab399fbe97763e465ea49c735 (patch) | |
| tree | 46104451c69f5270fcc11137aecff012a2ecf612 /include/linux/evm.h | |
| parent | 843d183cdd816549b73e6bd3ae07f64adddf714b (diff) | |
| parent | fb788d8b981fa55603873416882f8dcf835e7924 (diff) | |
Merge branch 'next-evm' of git://github.com/mzohar/linux-evm into next
Diffstat (limited to 'include/linux/evm.h')
| -rw-r--r-- | include/linux/evm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/evm.h b/include/linux/evm.h index ea603c9e775d..9fc13a760928 100644 --- a/include/linux/evm.h +++ b/include/linux/evm.h @@ -33,6 +33,14 @@ extern void evm_inode_post_removexattr(struct dentry *dentry, extern int evm_inode_init_security(struct inode *inode, const struct xattr *xattr_array, struct xattr *evm); +#ifdef CONFIG_FS_POSIX_ACL +extern int posix_xattr_acl(const char *xattrname); +#else +static inline int posix_xattr_acl(const char *xattrname) +{ + return 0; +} +#endif #else #ifdef CONFIG_INTEGRITY static inline enum integrity_status evm_verifyxattr(struct dentry *dentry, |