Merge branch 'for-linus' of git://github.com/ericvh/linux

[pandora-kernel.git] / security / security.c

diff --git a/security/security.c b/security/security.c
index 9ebda05..0c6cc69 100644 (file)
--- 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);
 }
@@ -1151,6 +1151,7 @@ void security_sk_clone(const struct sock *sk, struct sock *newsk)
 {
        security_ops->sk_clone_security(sk, newsk);
 }
+EXPORT_SYMBOL(security_sk_clone);
 
 void security_sk_classify_flow(struct sock *sk, struct flowi *fl)
 {