Commit a2f3be17 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller

unix/garbage: kill copy of the skb queue walker

Worse yet, it seems that its arguments were in reverse order. Also
remove one related helper which seems hardly worth keeping.
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 26d27844
...@@ -153,15 +153,6 @@ void unix_notinflight(struct file *fp) ...@@ -153,15 +153,6 @@ void unix_notinflight(struct file *fp)
} }
} }
static inline struct sk_buff *sock_queue_head(struct sock *sk)
{
return (struct sk_buff *)&sk->sk_receive_queue;
}
#define receive_queue_for_each_skb(sk, next, skb) \
for (skb = sock_queue_head(sk)->next, next = skb->next; \
skb != sock_queue_head(sk); skb = next, next = skb->next)
static void scan_inflight(struct sock *x, void (*func)(struct unix_sock *), static void scan_inflight(struct sock *x, void (*func)(struct unix_sock *),
struct sk_buff_head *hitlist) struct sk_buff_head *hitlist)
{ {
...@@ -169,7 +160,7 @@ static void scan_inflight(struct sock *x, void (*func)(struct unix_sock *), ...@@ -169,7 +160,7 @@ static void scan_inflight(struct sock *x, void (*func)(struct unix_sock *),
struct sk_buff *next; struct sk_buff *next;
spin_lock(&x->sk_receive_queue.lock); spin_lock(&x->sk_receive_queue.lock);
receive_queue_for_each_skb(x, next, skb) { skb_queue_walk_safe(&x->sk_receive_queue, skb, next) {
/* /*
* Do we have file descriptors ? * Do we have file descriptors ?
*/ */
...@@ -225,7 +216,7 @@ static void scan_children(struct sock *x, void (*func)(struct unix_sock *), ...@@ -225,7 +216,7 @@ static void scan_children(struct sock *x, void (*func)(struct unix_sock *),
* and perform a scan on them as well. * and perform a scan on them as well.
*/ */
spin_lock(&x->sk_receive_queue.lock); spin_lock(&x->sk_receive_queue.lock);
receive_queue_for_each_skb(x, next, skb) { skb_queue_walk_safe(&x->sk_receive_queue, skb, next) {
u = unix_sk(skb->sk); u = unix_sk(skb->sk);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment