diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-11-10 21:38:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-11-10 21:38:48 -0800 |
| commit | 17ab56a260734aabf7f03cc97785dda81571ea24 (patch) | |
| tree | d4d1ca98c62e0ae05156246c9cb2a7acf66e48e4 | |
| parent | e9671fcb3bef1fe2e71aa0456bd5b7eec9e8de4d (diff) | |
| download | linux-17ab56a260734aabf7f03cc97785dda81571ea24.tar.gz linux-17ab56a260734aabf7f03cc97785dda81571ea24.tar.bz2 linux-17ab56a260734aabf7f03cc97785dda81571ea24.zip | |
[PACKET]: Use existing sock refcnt debugging infrastructure
The packet_socks_nr variable is used purely for debugging
the number of sockets.
As Arnaldo pointed out, there's already an infrastructure
for this purposes, so switch to using it.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/packet/af_packet.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 4cb2dfba0993..36331a5f0abe 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -139,9 +139,6 @@ dev->hard_header == NULL (ll header is added by device, we cannot control it) static HLIST_HEAD(packet_sklist); static DEFINE_RWLOCK(packet_sklist_lock); -static atomic_t packet_socks_nr; - - /* Private packet socket structures. */ struct packet_mclist @@ -236,10 +233,7 @@ static void packet_sock_destruct(struct sock *sk) return; } - atomic_dec(&packet_socks_nr); -#ifdef PACKET_REFCNT_DEBUG - printk(KERN_DEBUG "PACKET socket %p is free, %d are alive\n", sk, atomic_read(&packet_socks_nr)); -#endif + sk_refcnt_debug_dec(sk); } @@ -849,6 +843,7 @@ static int packet_release(struct socket *sock) /* Purge queues */ skb_queue_purge(&sk->sk_receive_queue); + sk_refcnt_debug_release(sk); sock_put(sk); return 0; @@ -1010,7 +1005,7 @@ static int packet_create(struct net *net, struct socket *sock, int protocol) po->num = proto; sk->sk_destruct = packet_sock_destruct; - atomic_inc(&packet_socks_nr); + sk_refcnt_debug_inc(sk); /* * Attach a protocol block |