aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix/garbage.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/unix/garbage.c')
-rw-r--r--net/unix/garbage.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/unix/garbage.c b/net/unix/garbage.c
index abb3ab34cb1e..19c17e4a0c8b 100644
--- a/net/unix/garbage.c
+++ b/net/unix/garbage.c
@@ -106,8 +106,8 @@ static struct sock *unix_get_socket(struct file *filp)
106 * Socket ? 106 * Socket ?
107 */ 107 */
108 if (S_ISSOCK(inode->i_mode)) { 108 if (S_ISSOCK(inode->i_mode)) {
109 struct socket * sock = SOCKET_I(inode); 109 struct socket *sock = SOCKET_I(inode);
110 struct sock * s = sock->sk; 110 struct sock *s = sock->sk;
111 111
112 /* 112 /*
113 * PF_UNIX ? 113 * PF_UNIX ?
@@ -126,7 +126,7 @@ static struct sock *unix_get_socket(struct file *filp)
126void unix_inflight(struct file *fp) 126void unix_inflight(struct file *fp)
127{ 127{
128 struct sock *s = unix_get_socket(fp); 128 struct sock *s = unix_get_socket(fp);
129 if(s) { 129 if (s) {
130 struct unix_sock *u = unix_sk(s); 130 struct unix_sock *u = unix_sk(s);
131 spin_lock(&unix_gc_lock); 131 spin_lock(&unix_gc_lock);
132 if (atomic_long_inc_return(&u->inflight) == 1) { 132 if (atomic_long_inc_return(&u->inflight) == 1) {
@@ -143,7 +143,7 @@ void unix_inflight(struct file *fp)
143void unix_notinflight(struct file *fp) 143void unix_notinflight(struct file *fp)
144{ 144{
145 struct sock *s = unix_get_socket(fp); 145 struct sock *s = unix_get_socket(fp);
146 if(s) { 146 if (s) {
147 struct unix_sock *u = unix_sk(s); 147 struct unix_sock *u = unix_sk(s);
148 spin_lock(&unix_gc_lock); 148 spin_lock(&unix_gc_lock);
149 BUG_ON(list_empty(&u->link)); 149 BUG_ON(list_empty(&u->link));
@@ -156,7 +156,7 @@ void unix_notinflight(struct file *fp)
156 156
157static inline struct sk_buff *sock_queue_head(struct sock *sk) 157static inline struct sk_buff *sock_queue_head(struct sock *sk)
158{ 158{
159 return (struct sk_buff *) &sk->sk_receive_queue; 159 return (struct sk_buff *)&sk->sk_receive_queue;
160} 160}
161 161
162#define receive_queue_for_each_skb(sk, next, skb) \ 162#define receive_queue_for_each_skb(sk, next, skb) \
@@ -370,7 +370,7 @@ void unix_gc(void)
370 */ 370 */
371 skb_queue_head_init(&hitlist); 371 skb_queue_head_init(&hitlist);
372 list_for_each_entry(u, &gc_candidates, link) 372 list_for_each_entry(u, &gc_candidates, link)
373 scan_children(&u->sk, inc_inflight, &hitlist); 373 scan_children(&u->sk, inc_inflight, &hitlist);
374 374
375 spin_unlock(&unix_gc_lock); 375 spin_unlock(&unix_gc_lock);
376 376