From: Pavel Emelyanov <xemul@parallels•com>
To: David Miller <davem@davemloft•net>,
Eric Dumazet <eric.dumazet@gmail•com>,
Linux Netdev List <netdev@vger•kernel.org>
Subject: [PATCH 1/6] datagram: Factor out sk queue referencing
Date: Tue, 21 Feb 2012 21:30:33 +0400 [thread overview]
Message-ID: <4F43D4B9.8030005@parallels.com> (raw)
In-Reply-To: <4F43D49E.3010401@parallels.com>
This makes lines shorter and simplifies further patching.
Signed-off-by: Pavel Emelyanov <xemul@parallels•com>
---
net/core/datagram.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/net/core/datagram.c b/net/core/datagram.c
index 68bbf9f..6f54d0a 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -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;
--
1.5.5.6
next prev parent reply other threads:[~2012-02-21 17:30 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-21 17:30 [PATCH net-next 0/6] Ability to peek full socket queue Pavel Emelyanov
2012-02-21 17:30 ` Pavel Emelyanov [this message]
2012-02-21 17:39 ` [PATCH 1/6] datagram: Factor out sk queue referencing Eric Dumazet
2012-02-21 20:04 ` David Miller
2012-02-21 17:30 ` [PATCH 2/6] datagram: Add offset argument to __skb_recv_datagram Pavel Emelyanov
2012-02-21 17:40 ` Eric Dumazet
2012-02-21 20:04 ` David Miller
2012-02-21 17:31 ` [PATCH 3/6] skb: Add skb_peek_next helper Pavel Emelyanov
2012-02-21 17:43 ` Eric Dumazet
2012-02-21 20:04 ` David Miller
2012-02-21 17:31 ` [PATCH 4/6] sock: Introduce the SO_PEEK_OFF sock option Pavel Emelyanov
2012-02-21 17:45 ` Eric Dumazet
2012-02-21 20:05 ` David Miller
2012-02-21 17:31 ` [PATCH 5/6] unix: Support peeking offset for datagram and seqpacket sockets Pavel Emelyanov
2012-02-21 17:49 ` Eric Dumazet
2012-02-21 20:05 ` David Miller
2012-02-21 17:32 ` [PATCH 6/6] unix: Support peeking offset for stream sockets Pavel Emelyanov
2012-02-21 17:51 ` Eric Dumazet
2012-02-21 20:05 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F43D4B9.8030005@parallels.com \
--to=xemul@parallels$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox