From: James Morris <jmorris@namei.org>
Date: Thu, 29 Jan 2009 01:15:59 +0000 (+1100)
Subject: selinux: remove secondary ops call to inode_setattr
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=438add6b32d9295db6e3ecd4d9e137086ec5b5d9;p=linux-2.6-omap-h63xx.git

selinux: remove secondary ops call to inode_setattr

Remove secondary ops call to inode_setattr, 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 7e90c9e5865..08b506846a1 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2694,11 +2694,6 @@ static int selinux_inode_permission(struct inode *inode, int mask)
 static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr)
 {
 	const struct cred *cred = current_cred();
-	int rc;
-
-	rc = secondary_ops->inode_setattr(dentry, iattr);
-	if (rc)
-		return rc;
 
 	if (iattr->ia_valid & ATTR_FORCE)
 		return 0;