Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[linux-2.6-omap-h63xx.git] / security / selinux / include / objsec.h

diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
index f8be8d7fa26d7962f020e612254653d849f5b226..c4e062336ef3a6d6265d99f750e6ea8c6ba8f8f7 100644 (file)
--- a/security/selinux/include/objsec.h
+++ b/security/selinux/include/objsec.h
@@ -60,9 +60,7 @@ struct superblock_security_struct {
        u32 def_sid;                    /* default SID for labeling */
        u32 mntpoint_sid;               /* SECURITY_FS_USE_MNTPOINT context for files */
        unsigned int behavior;          /* labeling behavior */
-       unsigned char initialized;      /* initialization flag */
        unsigned char flags;            /* which mount options were specified */
-       unsigned char proc;             /* proc fs */
        struct mutex lock;
        struct list_head isec_head;
        spinlock_t isec_lock;
@@ -77,17 +75,6 @@ struct ipc_security_struct {
        u32 sid;        /* SID of IPC resource */
 };
 
-struct bprm_security_struct {
-       u32 sid;                /* SID for transformed process */
-       unsigned char set;
-
-       /*
-        * unsafe is used to share failure information from bprm_apply_creds()
-        * to bprm_post_apply_creds().
-        */
-       char unsafe;
-};
-
 struct netif_security_struct {
        int ifindex;                    /* device index */
        u32 sid;                        /* SID for this interface */