[PATCH 3.2 088/110] datagram: Factor out sk queue referencing
From: Ben Hutchings <hidden>
Date: 2015-08-10 10:17:12
Also in:
lkml
3.2.71-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Pavel Emelyanov <redacted> commit 4934b0329f7150dcb5f90506860e2db32274c755 upstream. This makes lines shorter and simplifies further patching. Signed-off-by: Pavel Emelyanov <redacted> Acked-by: Eric Dumazet <redacted> Signed-off-by: David S. Miller <davem@davemloft.net> [bwh: Prerequisite of "net: Clone skb before setting peeked flag"] Signed-off-by: Ben Hutchings <redacted> --- net/core/datagram.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
--- a/net/core/datagram.c
+++ b/net/core/datagram.c@@ -180,18 +180,19 @@ struct sk_buff *__skb_recv_datagram(stru * 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;