diff options
Diffstat (limited to 'net/unix/garbage.c')
-rw-r--r-- | net/unix/garbage.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/net/unix/garbage.c b/net/unix/garbage.c index f14ad6635fcc..f20b7ea7c555 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c | |||
@@ -63,9 +63,8 @@ | |||
63 | * Damn. Added missing check for ->dead in listen queues scanning. | 63 | * Damn. Added missing check for ->dead in listen queues scanning. |
64 | * | 64 | * |
65 | */ | 65 | */ |
66 | 66 | ||
67 | #include <linux/kernel.h> | 67 | #include <linux/kernel.h> |
68 | #include <linux/sched.h> | ||
69 | #include <linux/string.h> | 68 | #include <linux/string.h> |
70 | #include <linux/socket.h> | 69 | #include <linux/socket.h> |
71 | #include <linux/un.h> | 70 | #include <linux/un.h> |
@@ -118,7 +117,7 @@ static struct sock *unix_get_socket(struct file *filp) | |||
118 | * Keep the number of times in flight count for the file | 117 | * Keep the number of times in flight count for the file |
119 | * descriptor if it is for an AF_UNIX socket. | 118 | * descriptor if it is for an AF_UNIX socket. |
120 | */ | 119 | */ |
121 | 120 | ||
122 | void unix_inflight(struct file *fp) | 121 | void unix_inflight(struct file *fp) |
123 | { | 122 | { |
124 | struct sock *s = unix_get_socket(fp); | 123 | struct sock *s = unix_get_socket(fp); |
@@ -190,7 +189,7 @@ void unix_gc(void) | |||
190 | unix_sk(s)->gc_tree = GC_ORPHAN; | 189 | unix_sk(s)->gc_tree = GC_ORPHAN; |
191 | } | 190 | } |
192 | /* | 191 | /* |
193 | * Everything is now marked | 192 | * Everything is now marked |
194 | */ | 193 | */ |
195 | 194 | ||
196 | /* Invariant to be maintained: | 195 | /* Invariant to be maintained: |
@@ -227,7 +226,7 @@ void unix_gc(void) | |||
227 | } | 226 | } |
228 | 227 | ||
229 | /* | 228 | /* |
230 | * Mark phase | 229 | * Mark phase |
231 | */ | 230 | */ |
232 | 231 | ||
233 | while (!empty_stack()) | 232 | while (!empty_stack()) |
@@ -237,11 +236,11 @@ void unix_gc(void) | |||
237 | 236 | ||
238 | spin_lock(&x->sk_receive_queue.lock); | 237 | spin_lock(&x->sk_receive_queue.lock); |
239 | skb = skb_peek(&x->sk_receive_queue); | 238 | skb = skb_peek(&x->sk_receive_queue); |
240 | 239 | ||
241 | /* | 240 | /* |
242 | * Loop through all but first born | 241 | * Loop through all but first born |
243 | */ | 242 | */ |
244 | 243 | ||
245 | while (skb && skb != (struct sk_buff *)&x->sk_receive_queue) { | 244 | while (skb && skb != (struct sk_buff *)&x->sk_receive_queue) { |
246 | /* | 245 | /* |
247 | * Do we have file descriptors ? | 246 | * Do we have file descriptors ? |