From: James Morris <jmorris@namei.org>
Date: Mon, 19 May 2008 23:42:33 +0000 (+1000)
Subject: SELinux: remove inherit field from inode_security_struct
X-Git-Tag: v2.6.27-rc1~1109^2~20
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=feb2a5b82d87fbdc01c00b7e9413e4b5f4c1f0c1;p=linux-2.6-omap-h63xx.git

SELinux: remove inherit field from inode_security_struct

Remove inherit field from inode_security_struct, per Stephen Smalley:
"Let's just drop inherit altogether - dead field."

Signed-off-by: James Morris <jmorris@namei.org>
---

diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
index 5f0be19ca43..91070ab874c 100644
--- a/security/selinux/include/objsec.h
+++ b/security/selinux/include/objsec.h
@@ -43,7 +43,6 @@ struct inode_security_struct {
 	u32 sid;		/* SID of this object */
 	u16 sclass;		/* security class of this object */
 	unsigned char initialized;	/* initialization flag */
-	unsigned char inherit;	/* inherit SID from parent entry */
 	struct mutex lock;
 };