Merge remote-tracking branch 'lsk/v3.10/topic/arm64-hugepages' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / include / net / af_unix.h

diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index 0a996a3517edd2e652bb389ca4093d9928e7b974..dbdfd2b0f3b3dbe0a4470d83e19052db4ba3aa04 100644 (file)
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -29,7 +29,8 @@ struct unix_address {
 
 struct unix_skb_parms {
        struct pid              *pid;           /* Skb credentials      */
-       const struct cred       *cred;
+       kuid_t                  uid;
+       kgid_t                  gid;
        struct scm_fp_list      *fp;            /* Passed files         */
 #ifdef CONFIG_SECURITY_NETWORK
        u32                     secid;          /* Security ID          */
@@ -56,9 +57,10 @@ struct unix_sock {
        struct list_head        link;
        atomic_long_t           inflight;
        spinlock_t              lock;
-       unsigned int            gc_candidate : 1;
-       unsigned int            gc_maybe_cycle : 1;
        unsigned char           recursion_level;
+       unsigned long           gc_flags;
+#define UNIX_GC_CANDIDATE      0
+#define UNIX_GC_MAYBE_CYCLE    1
        struct socket_wq        peer_wq;
 };
 #define unix_sk(__sk) ((struct unix_sock *)__sk)