Skip to content

Commit

Permalink
[PACKET]: Use existing sock refcnt debugging infrastructure
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Nov 11, 2007
1 parent e9671fc commit 17ab56a
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions net/packet/af_packet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);
}


Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 17ab56a

Please sign in to comment.