diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2017-06-12 11:23:41 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-06-12 10:01:29 -0400 |
| commit | 3889a803e1da9bd7cd10d6504bf281ee7e55dfd6 (patch) | |
| tree | a02fdf7382352a186732bb51028ccebcdc2afde1 /net | |
| parent | sh_eth: add support for changing MTU (diff) | |
| download | linux-dev-3889a803e1da9bd7cd10d6504bf281ee7e55dfd6.tar.xz linux-dev-3889a803e1da9bd7cd10d6504bf281ee7e55dfd6.zip | |
net: factor out a helper to decrement the skb refcount
The same code is replicated in 3 different places; move it to a
common helper.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/datagram.c | 4 | ||||
| -rw-r--r-- | net/core/skbuff.c | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/net/core/datagram.c b/net/core/datagram.c index bc46118486fe..e5311a7c70da 100644 --- a/net/core/datagram.c +++ b/net/core/datagram.c @@ -330,9 +330,7 @@ void __skb_free_datagram_locked(struct sock *sk, struct sk_buff *skb, int len) { bool slow; - if (likely(atomic_read(&skb->users) == 1)) - smp_rmb(); - else if (likely(!atomic_dec_and_test(&skb->users))) { + if (!skb_unref(skb)) { sk_peek_offset_bwd(sk, len); return; } diff --git a/net/core/skbuff.c b/net/core/skbuff.c index e508c1eae67f..747263c49838 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -694,12 +694,9 @@ EXPORT_SYMBOL(__kfree_skb); */ void kfree_skb(struct sk_buff *skb) { - if (unlikely(!skb)) - return; - if (likely(atomic_read(&skb->users) == 1)) - smp_rmb(); - else if (likely(!atomic_dec_and_test(&skb->users))) + if (!skb_unref(skb)) return; + trace_kfree_skb(skb, __builtin_return_address(0)); __kfree_skb(skb); } @@ -746,12 +743,9 @@ EXPORT_SYMBOL(skb_tx_error); */ void consume_skb(struct sk_buff *skb) { - if (unlikely(!skb)) - return; - if (likely(atomic_read(&skb->users) == 1)) - smp_rmb(); - else if (likely(!atomic_dec_and_test(&skb->users))) + if (!skb_unref(skb)) return; + trace_consume_skb(skb); __kfree_skb(skb); } |