Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/security/security.c b/security/security.c
index 4ba6d4cc061f294142b126b962a99986a1285a6c..0e4fccfef12cb495fcf059a4dc964e3b45ee136c 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -518,14 +518,7 @@ int security_inode_permission(struct inode *inode, int mask)
 {
        if (unlikely(IS_PRIVATE(inode)))
                return 0;
-       return security_ops->inode_permission(inode, mask, 0);
-}
-
-int security_inode_exec_permission(struct inode *inode, unsigned int flags)
-{
-       if (unlikely(IS_PRIVATE(inode)))
-               return 0;
-       return security_ops->inode_permission(inode, MAY_EXEC, flags);
+       return security_ops->inode_permission(inode, mask);
 }
 
 int security_inode_setattr(struct dentry *dentry, struct iattr *attr)