From eda87d05b4a680e4855c830d7c318866145a16d7 Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@namei.org>
Date: Thu, 29 Jan 2009 12:15:59 +1100
Subject: [PATCH] --- yaml --- r: 132586 b: refs/heads/master c:
 438add6b32d9295db6e3ecd4d9e137086ec5b5d9 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/security/selinux/hooks.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 71c080565caf..b3d924e5f98d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 188fbcca9dd02f15dcf45cfc51ce0dd6c13993f6
+refs/heads/master: 438add6b32d9295db6e3ecd4d9e137086ec5b5d9
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
index 7e90c9e58657..08b506846a1f 100644
--- a/trunk/security/selinux/hooks.c
+++ b/trunk/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;