summaryrefslogtreecommitdiffstats
path: root/include/net/sock.h
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-03-28 16:39:33 -0700
committerDavid S. Miller <davem@davemloft.net>2008-03-28 16:39:33 -0700
commitbdcde3d71a67e97f25e851f3ca97c9bb5ef03e7f (patch)
treeeab4a66777582718ffe2eff9038324331106ec18 /include/net/sock.h
parent60e7663d462af3994f292cb3691ea4f7371a9220 (diff)
downloadop-kernel-dev-bdcde3d71a67e97f25e851f3ca97c9bb5ef03e7f.zip
op-kernel-dev-bdcde3d71a67e97f25e851f3ca97c9bb5ef03e7f.tar.gz
[SOCK]: Drop inuse pcounter from struct proto (v2).
An uppercut - do not use the pcounter on struct proto. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Acked-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sock.h')
-rw-r--r--include/net/sock.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 1f42942..2a3344f 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -47,7 +47,6 @@
#include <linux/module.h>
#include <linux/lockdep.h>
#include <linux/netdevice.h>
-#include <linux/pcounter.h>
#include <linux/skbuff.h> /* struct sk_buff */
#include <linux/mm.h>
#include <linux/security.h>
@@ -563,7 +562,6 @@ struct proto {
/* Keeping track of sockets in use */
#ifdef CONFIG_PROC_FS
unsigned int inuse_idx;
- struct pcounter inuse;
#endif
/* Memory pressure */
@@ -636,14 +634,10 @@ static inline void sk_refcnt_debug_release(const struct sock *sk)
#ifdef CONFIG_PROC_FS
-# define DEFINE_PROTO_INUSE(NAME) DEFINE_PCOUNTER(NAME)
-# define REF_PROTO_INUSE(NAME) PCOUNTER_MEMBER_INITIALIZER(NAME, .inuse)
/* Called with local bh disabled */
extern void sock_prot_inuse_add(struct proto *prot, int inc);
extern int sock_prot_inuse_get(struct proto *proto);
#else
-# define DEFINE_PROTO_INUSE(NAME)
-# define REF_PROTO_INUSE(NAME)
static void inline sock_prot_inuse_add(struct proto *prot, int inc)
{
}
OpenPOWER on IntegriCloud