smack: remove redundant structure variable from header.

[linux-2.6-block.git] / security / smack / smack.h

diff --git a/security/smack/smack.h b/security/smack/smack.h
index 62529f382942643a7a00d21d77ed21a400175c7f..09ed7f343be45193ed8f8bedf912433ba2c8dcf8 100644 (file)
--- a/security/smack/smack.h
+++ b/security/smack/smack.h
@@ -111,7 +111,6 @@ struct inode_smack {
        struct smack_known      *smk_mmap;      /* label of the mmap domain */
        struct mutex            smk_lock;       /* initialization lock */
        int                     smk_flags;      /* smack inode flags */
-       struct rcu_head         smk_rcu;        /* for freeing inode_smack */
 };
 
 struct task_smack {
@@ -148,7 +147,6 @@ struct smk_net4addr {
        struct smack_known      *smk_label;     /* label */
 };
 
-#if IS_ENABLED(CONFIG_IPV6)
 /*
  * An entry in the table identifying IPv6 hosts.
  */
@@ -159,9 +157,7 @@ struct smk_net6addr {
        int                     smk_masks;      /* mask size */
        struct smack_known      *smk_label;     /* label */
 };
-#endif /* CONFIG_IPV6 */
 
-#ifdef SMACK_IPV6_PORT_LABELING
 /*
  * An entry in the table identifying ports.
  */
@@ -174,7 +170,6 @@ struct smk_port_label {
        short                   smk_sock_type;  /* Socket type */
        short                   smk_can_reuse;
 };
-#endif /* SMACK_IPV6_PORT_LABELING */
 
 struct smack_known_list_elem {
        struct list_head        list;
@@ -335,9 +330,7 @@ extern struct smack_known smack_known_web;
 extern struct mutex    smack_known_lock;
 extern struct list_head smack_known_list;
 extern struct list_head smk_net4addr_list;
-#if IS_ENABLED(CONFIG_IPV6)
 extern struct list_head smk_net6addr_list;
-#endif /* CONFIG_IPV6 */
 
 extern struct mutex     smack_onlycap_lock;
 extern struct list_head smack_onlycap_list;