diff options
author | James Morris <jmorris@namei.org> | 2011-09-15 01:53:38 +0200 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-09-15 01:53:38 +0200 |
commit | 8de6ac7f58a22fdab399fbe97763e465ea49c735 (patch) | |
tree | 46104451c69f5270fcc11137aecff012a2ecf612 /security/security.c | |
parent | TOMOYO: Bump version. (diff) | |
parent | evm: clean verification status (diff) | |
download | linux-8de6ac7f58a22fdab399fbe97763e465ea49c735.tar.xz linux-8de6ac7f58a22fdab399fbe97763e465ea49c735.zip |
Merge branch 'next-evm' of git://github.com/mzohar/linux-evm into next
Diffstat (limited to 'security/security.c')
-rw-r--r-- | security/security.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c index 9ebda054a333..c1d69875db6c 100644 --- a/security/security.c +++ b/security/security.c @@ -348,7 +348,7 @@ int security_inode_init_security(struct inode *inode, struct inode *dir, int ret; if (unlikely(IS_PRIVATE(inode))) - return -EOPNOTSUPP; + return 0; memset(new_xattrs, 0, sizeof new_xattrs); if (!initxattrs) @@ -381,7 +381,7 @@ int security_old_inode_init_security(struct inode *inode, struct inode *dir, void **value, size_t *len) { if (unlikely(IS_PRIVATE(inode))) - return -EOPNOTSUPP; + return 0; return security_ops->inode_init_security(inode, dir, qstr, name, value, len); } |