From: James Morris <jmorris@namei.org>
Date: Thu, 29 Jan 2009 01:14:03 +0000 (+1100)
Subject: selinux: remove secondary ops call to inode_permission
X-Git-Tag: v2.6.30-rc1~679^2~59
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=188fbcca9dd02f15dcf45cfc51ce0dd6c13993f6;p=pandora-kernel.git

selinux: remove secondary ops call to inode_permission

Remove secondary ops call to inode_permission, which is
a noop in capabilities.

Acked-by: Serge Hallyn <serue@us.ibm.com>
Acked-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
---

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 67291a385c75..7e90c9e58657 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2681,11 +2681,6 @@ static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *na
 static int selinux_inode_permission(struct inode *inode, int mask)
 {
 	const struct cred *cred = current_cred();
-	int rc;
-
-	rc = secondary_ops->inode_permission(inode, mask);
-	if (rc)
-		return rc;
 
 	if (!mask) {
 		/* No permission to check.  Existence test. */