Skip to content

Commit

Permalink
datagram: Factor out sk queue referencing
Browse files Browse the repository at this point in the history
This makes lines shorter and simplifies further patching.

Signed-off-by: Pavel Emelyanov <[email protected]>
Acked-by: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
xemul authored and davem330 committed Feb 21, 2012
1 parent 0b0a635 commit 4934b03
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions net/core/datagram.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,18 +180,19 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned flags,
* However, this function was correct in any case. 8)
*/
unsigned long cpu_flags;
struct sk_buff_head *queue = &sk->sk_receive_queue;

spin_lock_irqsave(&sk->sk_receive_queue.lock, cpu_flags);
skb = skb_peek(&sk->sk_receive_queue);
spin_lock_irqsave(&queue->lock, cpu_flags);
skb = skb_peek(queue);
if (skb) {
*peeked = skb->peeked;
if (flags & MSG_PEEK) {
skb->peeked = 1;
atomic_inc(&skb->users);
} else
__skb_unlink(skb, &sk->sk_receive_queue);
__skb_unlink(skb, queue);
}
spin_unlock_irqrestore(&sk->sk_receive_queue.lock, cpu_flags);
spin_unlock_irqrestore(&queue->lock, cpu_flags);

if (skb)
return skb;
Expand Down

0 comments on commit 4934b03

Please sign in to comment.