From fdeb05184b8b2500e120647778d63fddba76dc59 Mon Sep 17 00:00:00 2001 From: Richard Kennedy Date: Sun, 18 May 2008 12:32:57 +0100 Subject: SELinux: reorder inode_security_struct to increase objs/slab on 64bit reorder inode_security_struct to remove padding on 64 bit builds size reduced from 72 to 64 bytes increasing objects per slab to 64. Signed-off-by: Richard Kennedy Signed-off-by: James Morris --- security/selinux/include/objsec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'security/selinux/include/objsec.h') diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h index 032c2357dad..5f0be19ca43 100644 --- a/security/selinux/include/objsec.h +++ b/security/selinux/include/objsec.h @@ -43,8 +43,8 @@ struct inode_security_struct { u32 sid; /* SID of this object */ u16 sclass; /* security class of this object */ unsigned char initialized; /* initialization flag */ - struct mutex lock; unsigned char inherit; /* inherit SID from parent entry */ + struct mutex lock; }; struct file_security_struct { -- cgit v1.2.3-70-g09d2 From feb2a5b82d87fbdc01c00b7e9413e4b5f4c1f0c1 Mon Sep 17 00:00:00 2001 From: James Morris Date: Tue, 20 May 2008 09:42:33 +1000 Subject: 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 --- security/selinux/include/objsec.h | 1 - 1 file changed, 1 deletion(-) (limited to 'security/selinux/include/objsec.h') 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; }; -- cgit v1.2.3-70-g09d2