From: Pavel Emelyanov <xemul@openvz.org>
To: David Miller <davem@davemloft.net>
Cc: Linux Netdev List <netdev@vger.kernel.org>, devel@openvz.org
Subject: [PATCH][PACKET] Remove unneeded packet_socks_nr variable
Date: Wed, 07 Nov 2007 18:32:51 +0300 [thread overview]
Message-ID: <4731DAA3.7060306@openvz.org> (raw)
This one is used only under ifdef PACKET_REFCNT_DEBUG in
printk and is not needed otherwise. So hide all this stuff
under the PACKET_REFCNT_DEBUG.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 4cb2dfb..e6a96ee 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -139,8 +139,30 @@ 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);
+#ifdef PACKET_REFCNT_DEBUG
static atomic_t packet_socks_nr;
+static void packet_sock_inc(void)
+{
+ atomic_inc(&packet_socks_nr);
+}
+
+static void packet_sock_dec(void)
+{
+ atomic_dec(&packet_socks_nr);
+ printk(KERN_DEBUG "PACKET socket %p is free, %d are alive\n",
+ sk, atomic_read(&packet_socks_nr));
+}
+#else
+static inline void packet_sock_inc(void)
+{
+}
+
+static inline void packet_sock_dec(void)
+{
+}
+#endif
+
/* Private packet socket structures. */
@@ -236,10 +258,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
+ packet_sock_dec();
}
@@ -1010,7 +1029,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);
+ packet_sock_inc();
/*
* Attach a protocol block
--
1.5.3.4
next reply other threads:[~2007-11-07 15:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-07 15:32 Pavel Emelyanov [this message]
2007-11-07 15:50 ` [PATCH][PACKET] Remove unneeded packet_socks_nr variable Arnaldo Carvalho de Melo
2007-11-07 15:53 ` Arnaldo Carvalho de Melo
2007-11-07 16:16 ` Pavel Emelyanov
2007-11-07 16:26 ` Arnaldo Carvalho de Melo
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=4731DAA3.7060306@openvz.org \
--to=xemul@openvz.org \
--cc=davem@davemloft.net \
--cc=devel@openvz.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).