Merge branches 'for-4.11/upstream-fixes', 'for-4.12/accutouch', 'for-4.12/cp2112...

[mirror_ubuntu-artful-kernel.git] / security / smack / smack.h

diff --git a/security/smack/smack.h b/security/smack/smack.h
index 77abe2efacae47f121c348c74801a0c0831fc793..612b810fbbc6359838c2a54429a49e88106d9549 100644 (file)
--- a/security/smack/smack.h
+++ b/security/smack/smack.h
@@ -114,6 +114,7 @@ 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 {
@@ -173,6 +174,8 @@ struct smk_port_label {
        unsigned short          smk_port;       /* the port number */
        struct smack_known      *smk_in;        /* inbound label */
        struct smack_known      *smk_out;       /* outgoing label */
+       short                   smk_sock_type;  /* Socket type */
+       short                   smk_can_reuse;
 };
 #endif /* SMACK_IPV6_PORT_LABELING */