Merge commit 'v3.14' into next

[karo-tx-linux.git] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index 21e2b9cae685f01536ed159443707d5046c8c34c..ad0d4de6994474aba384955e240c73b88a03398e 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -116,7 +116,7 @@ static int cap_dentry_init_security(struct dentry *dentry, int mode,
                                        struct qstr *name, void **ctx,
                                        u32 *ctxlen)
 {
-       return 0;
+       return -EOPNOTSUPP;
 }
 
 static int cap_inode_alloc_security(struct inode *inode)