diff options
Diffstat (limited to 'include/net/af_unix.h')
-rw-r--r-- | include/net/af_unix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 90c9e2872f27..91ab5b01678a 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h | |||
@@ -10,6 +10,7 @@ extern void unix_inflight(struct file *fp); | |||
10 | extern void unix_notinflight(struct file *fp); | 10 | extern void unix_notinflight(struct file *fp); |
11 | extern void unix_gc(void); | 11 | extern void unix_gc(void); |
12 | extern void wait_for_unix_gc(void); | 12 | extern void wait_for_unix_gc(void); |
13 | extern struct sock *unix_get_socket(struct file *filp); | ||
13 | 14 | ||
14 | #define UNIX_HASH_SIZE 256 | 15 | #define UNIX_HASH_SIZE 256 |
15 | 16 | ||
@@ -40,7 +41,6 @@ struct unix_skb_parms { | |||
40 | spin_lock_nested(&unix_sk(s)->lock, \ | 41 | spin_lock_nested(&unix_sk(s)->lock, \ |
41 | SINGLE_DEPTH_NESTING) | 42 | SINGLE_DEPTH_NESTING) |
42 | 43 | ||
43 | #ifdef __KERNEL__ | ||
44 | /* The AF_UNIX socket */ | 44 | /* The AF_UNIX socket */ |
45 | struct unix_sock { | 45 | struct unix_sock { |
46 | /* WARNING: sk has to be the first member */ | 46 | /* WARNING: sk has to be the first member */ |
@@ -56,6 +56,7 @@ struct unix_sock { | |||
56 | spinlock_t lock; | 56 | spinlock_t lock; |
57 | unsigned int gc_candidate : 1; | 57 | unsigned int gc_candidate : 1; |
58 | unsigned int gc_maybe_cycle : 1; | 58 | unsigned int gc_maybe_cycle : 1; |
59 | unsigned char recursion_level; | ||
59 | struct socket_wq peer_wq; | 60 | struct socket_wq peer_wq; |
60 | }; | 61 | }; |
61 | #define unix_sk(__sk) ((struct unix_sock *)__sk) | 62 | #define unix_sk(__sk) ((struct unix_sock *)__sk) |
@@ -70,4 +71,3 @@ static inline int unix_sysctl_register(struct net *net) { return 0; } | |||
70 | static inline void unix_sysctl_unregister(struct net *net) {} | 71 | static inline void unix_sysctl_unregister(struct net *net) {} |
71 | #endif | 72 | #endif |
72 | #endif | 73 | #endif |
73 | #endif | ||