aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-03-28 19:39:33 -0400
committerDavid S. Miller <davem@davemloft.net>2008-03-28 19:39:33 -0400
commitbdcde3d71a67e97f25e851f3ca97c9bb5ef03e7f (patch)
treeeab4a66777582718ffe2eff9038324331106ec18
parent60e7663d462af3994f292cb3691ea4f7371a9220 (diff)
[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>
-rw-r--r--include/net/sock.h6
-rw-r--r--net/dccp/ipv4.c3
-rw-r--r--net/dccp/ipv6.c3
-rw-r--r--net/ipv4/raw.c3
-rw-r--r--net/ipv4/tcp_ipv4.c3
-rw-r--r--net/ipv4/udp.c3
-rw-r--r--net/ipv4/udplite.c3
-rw-r--r--net/ipv6/raw.c3
-rw-r--r--net/ipv6/tcp_ipv6.c3
-rw-r--r--net/ipv6/udp.c3
-rw-r--r--net/ipv6/udplite.c3
-rw-r--r--net/sctp/socket.c5
12 files changed, 0 insertions, 41 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 1f4294252dd7..2a3344f666aa 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -47,7 +47,6 @@
47#include <linux/module.h> 47#include <linux/module.h>
48#include <linux/lockdep.h> 48#include <linux/lockdep.h>
49#include <linux/netdevice.h> 49#include <linux/netdevice.h>
50#include <linux/pcounter.h>
51#include <linux/skbuff.h> /* struct sk_buff */ 50#include <linux/skbuff.h> /* struct sk_buff */
52#include <linux/mm.h> 51#include <linux/mm.h>
53#include <linux/security.h> 52#include <linux/security.h>
@@ -563,7 +562,6 @@ struct proto {
563 /* Keeping track of sockets in use */ 562 /* Keeping track of sockets in use */
564#ifdef CONFIG_PROC_FS 563#ifdef CONFIG_PROC_FS
565 unsigned int inuse_idx; 564 unsigned int inuse_idx;
566 struct pcounter inuse;
567#endif 565#endif
568 566
569 /* Memory pressure */ 567 /* Memory pressure */
@@ -636,14 +634,10 @@ static inline void sk_refcnt_debug_release(const struct sock *sk)
636 634
637 635
638#ifdef CONFIG_PROC_FS 636#ifdef CONFIG_PROC_FS
639# define DEFINE_PROTO_INUSE(NAME) DEFINE_PCOUNTER(NAME)
640# define REF_PROTO_INUSE(NAME) PCOUNTER_MEMBER_INITIALIZER(NAME, .inuse)
641/* Called with local bh disabled */ 637/* Called with local bh disabled */
642extern void sock_prot_inuse_add(struct proto *prot, int inc); 638extern void sock_prot_inuse_add(struct proto *prot, int inc);
643extern int sock_prot_inuse_get(struct proto *proto); 639extern int sock_prot_inuse_get(struct proto *proto);
644#else 640#else
645# define DEFINE_PROTO_INUSE(NAME)
646# define REF_PROTO_INUSE(NAME)
647static void inline sock_prot_inuse_add(struct proto *prot, int inc) 641static void inline sock_prot_inuse_add(struct proto *prot, int inc)
648{ 642{
649} 643}
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 4ca8b0c93c80..7d62f7eb6134 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -915,8 +915,6 @@ static struct timewait_sock_ops dccp_timewait_sock_ops = {
915 .twsk_obj_size = sizeof(struct inet_timewait_sock), 915 .twsk_obj_size = sizeof(struct inet_timewait_sock),
916}; 916};
917 917
918DEFINE_PROTO_INUSE(dccp_v4)
919
920static struct proto dccp_v4_prot = { 918static struct proto dccp_v4_prot = {
921 .name = "DCCP", 919 .name = "DCCP",
922 .owner = THIS_MODULE, 920 .owner = THIS_MODULE,
@@ -946,7 +944,6 @@ static struct proto dccp_v4_prot = {
946 .compat_setsockopt = compat_dccp_setsockopt, 944 .compat_setsockopt = compat_dccp_setsockopt,
947 .compat_getsockopt = compat_dccp_getsockopt, 945 .compat_getsockopt = compat_dccp_getsockopt,
948#endif 946#endif
949 REF_PROTO_INUSE(dccp_v4)
950}; 947};
951 948
952static struct net_protocol dccp_v4_protocol = { 949static struct net_protocol dccp_v4_protocol = {
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 2fec1af1a8c3..ea3f32648618 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -1100,8 +1100,6 @@ static struct timewait_sock_ops dccp6_timewait_sock_ops = {
1100 .twsk_obj_size = sizeof(struct dccp6_timewait_sock), 1100 .twsk_obj_size = sizeof(struct dccp6_timewait_sock),
1101}; 1101};
1102 1102
1103DEFINE_PROTO_INUSE(dccp_v6)
1104
1105static struct proto dccp_v6_prot = { 1103static struct proto dccp_v6_prot = {
1106 .name = "DCCPv6", 1104 .name = "DCCPv6",
1107 .owner = THIS_MODULE, 1105 .owner = THIS_MODULE,
@@ -1131,7 +1129,6 @@ static struct proto dccp_v6_prot = {
1131 .compat_setsockopt = compat_dccp_setsockopt, 1129 .compat_setsockopt = compat_dccp_setsockopt,
1132 .compat_getsockopt = compat_dccp_getsockopt, 1130 .compat_getsockopt = compat_dccp_getsockopt,
1133#endif 1131#endif
1134 REF_PROTO_INUSE(dccp_v6)
1135}; 1132};
1136 1133
1137static struct inet6_protocol dccp_v6_protocol = { 1134static struct inet6_protocol dccp_v6_protocol = {
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index d965f0a39c84..349205048557 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -818,8 +818,6 @@ static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg)
818 } 818 }
819} 819}
820 820
821DEFINE_PROTO_INUSE(raw)
822
823struct proto raw_prot = { 821struct proto raw_prot = {
824 .name = "RAW", 822 .name = "RAW",
825 .owner = THIS_MODULE, 823 .owner = THIS_MODULE,
@@ -842,7 +840,6 @@ struct proto raw_prot = {
842 .compat_setsockopt = compat_raw_setsockopt, 840 .compat_setsockopt = compat_raw_setsockopt,
843 .compat_getsockopt = compat_raw_getsockopt, 841 .compat_getsockopt = compat_raw_getsockopt,
844#endif 842#endif
845 REF_PROTO_INUSE(raw)
846}; 843};
847 844
848#ifdef CONFIG_PROC_FS 845#ifdef CONFIG_PROC_FS
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 2a5881c81778..ef141b841d2f 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2451,8 +2451,6 @@ void tcp4_proc_exit(void)
2451} 2451}
2452#endif /* CONFIG_PROC_FS */ 2452#endif /* CONFIG_PROC_FS */
2453 2453
2454DEFINE_PROTO_INUSE(tcp)
2455
2456struct proto tcp_prot = { 2454struct proto tcp_prot = {
2457 .name = "TCP", 2455 .name = "TCP",
2458 .owner = THIS_MODULE, 2456 .owner = THIS_MODULE,
@@ -2488,7 +2486,6 @@ struct proto tcp_prot = {
2488 .compat_setsockopt = compat_tcp_setsockopt, 2486 .compat_setsockopt = compat_tcp_setsockopt,
2489 .compat_getsockopt = compat_tcp_getsockopt, 2487 .compat_getsockopt = compat_tcp_getsockopt,
2490#endif 2488#endif
2491 REF_PROTO_INUSE(tcp)
2492}; 2489};
2493 2490
2494void __init tcp_v4_init(void) 2491void __init tcp_v4_init(void)
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 80007c79f12f..0255f373b3e5 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1467,8 +1467,6 @@ unsigned int udp_poll(struct file *file, struct socket *sock, poll_table *wait)
1467 1467
1468} 1468}
1469 1469
1470DEFINE_PROTO_INUSE(udp)
1471
1472struct proto udp_prot = { 1470struct proto udp_prot = {
1473 .name = "UDP", 1471 .name = "UDP",
1474 .owner = THIS_MODULE, 1472 .owner = THIS_MODULE,
@@ -1496,7 +1494,6 @@ struct proto udp_prot = {
1496 .compat_setsockopt = compat_udp_setsockopt, 1494 .compat_setsockopt = compat_udp_setsockopt,
1497 .compat_getsockopt = compat_udp_getsockopt, 1495 .compat_getsockopt = compat_udp_getsockopt,
1498#endif 1496#endif
1499 REF_PROTO_INUSE(udp)
1500}; 1497};
1501 1498
1502/* ------------------------------------------------------------------------ */ 1499/* ------------------------------------------------------------------------ */
diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index 53f3ed496328..7c1e0271c0db 100644
--- a/net/ipv4/udplite.c
+++ b/net/ipv4/udplite.c
@@ -34,8 +34,6 @@ static struct net_protocol udplite_protocol = {
34 .netns_ok = 1, 34 .netns_ok = 1,
35}; 35};
36 36
37DEFINE_PROTO_INUSE(udplite)
38
39struct proto udplite_prot = { 37struct proto udplite_prot = {
40 .name = "UDP-Lite", 38 .name = "UDP-Lite",
41 .owner = THIS_MODULE, 39 .owner = THIS_MODULE,
@@ -60,7 +58,6 @@ struct proto udplite_prot = {
60 .compat_setsockopt = compat_udp_setsockopt, 58 .compat_setsockopt = compat_udp_setsockopt,
61 .compat_getsockopt = compat_udp_getsockopt, 59 .compat_getsockopt = compat_udp_getsockopt,
62#endif 60#endif
63 REF_PROTO_INUSE(udplite)
64}; 61};
65 62
66static struct inet_protosw udplite4_protosw = { 63static struct inet_protosw udplite4_protosw = {
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 830da4603697..c1e495f105ad 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -1171,8 +1171,6 @@ static int rawv6_init_sk(struct sock *sk)
1171 return(0); 1171 return(0);
1172} 1172}
1173 1173
1174DEFINE_PROTO_INUSE(rawv6)
1175
1176struct proto rawv6_prot = { 1174struct proto rawv6_prot = {
1177 .name = "RAWv6", 1175 .name = "RAWv6",
1178 .owner = THIS_MODULE, 1176 .owner = THIS_MODULE,
@@ -1196,7 +1194,6 @@ struct proto rawv6_prot = {
1196 .compat_setsockopt = compat_rawv6_setsockopt, 1194 .compat_setsockopt = compat_rawv6_setsockopt,
1197 .compat_getsockopt = compat_rawv6_getsockopt, 1195 .compat_getsockopt = compat_rawv6_getsockopt,
1198#endif 1196#endif
1199 REF_PROTO_INUSE(rawv6)
1200}; 1197};
1201 1198
1202#ifdef CONFIG_PROC_FS 1199#ifdef CONFIG_PROC_FS
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 323c7e06ef43..6d851c3c3db9 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -2140,8 +2140,6 @@ void tcp6_proc_exit(struct net *net)
2140} 2140}
2141#endif 2141#endif
2142 2142
2143DEFINE_PROTO_INUSE(tcpv6)
2144
2145struct proto tcpv6_prot = { 2143struct proto tcpv6_prot = {
2146 .name = "TCPv6", 2144 .name = "TCPv6",
2147 .owner = THIS_MODULE, 2145 .owner = THIS_MODULE,
@@ -2177,7 +2175,6 @@ struct proto tcpv6_prot = {
2177 .compat_setsockopt = compat_tcp_setsockopt, 2175 .compat_setsockopt = compat_tcp_setsockopt,
2178 .compat_getsockopt = compat_tcp_getsockopt, 2176 .compat_getsockopt = compat_tcp_getsockopt,
2179#endif 2177#endif
2180 REF_PROTO_INUSE(tcpv6)
2181}; 2178};
2182 2179
2183static struct inet6_protocol tcpv6_protocol = { 2180static struct inet6_protocol tcpv6_protocol = {
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index aacbc82ecf0f..463ae4d448a3 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -999,8 +999,6 @@ void udp6_proc_exit(struct net *net) {
999 999
1000/* ------------------------------------------------------------------------ */ 1000/* ------------------------------------------------------------------------ */
1001 1001
1002DEFINE_PROTO_INUSE(udpv6)
1003
1004struct proto udpv6_prot = { 1002struct proto udpv6_prot = {
1005 .name = "UDPv6", 1003 .name = "UDPv6",
1006 .owner = THIS_MODULE, 1004 .owner = THIS_MODULE,
@@ -1027,7 +1025,6 @@ struct proto udpv6_prot = {
1027 .compat_setsockopt = compat_udpv6_setsockopt, 1025 .compat_setsockopt = compat_udpv6_setsockopt,
1028 .compat_getsockopt = compat_udpv6_getsockopt, 1026 .compat_getsockopt = compat_udpv6_getsockopt,
1029#endif 1027#endif
1030 REF_PROTO_INUSE(udpv6)
1031}; 1028};
1032 1029
1033static struct inet_protosw udpv6_protosw = { 1030static struct inet_protosw udpv6_protosw = {
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index 706c5c375a01..c5f5357d115d 100644
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -35,8 +35,6 @@ static struct inet6_protocol udplitev6_protocol = {
35 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, 35 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
36}; 36};
37 37
38DEFINE_PROTO_INUSE(udplitev6)
39
40struct proto udplitev6_prot = { 38struct proto udplitev6_prot = {
41 .name = "UDPLITEv6", 39 .name = "UDPLITEv6",
42 .owner = THIS_MODULE, 40 .owner = THIS_MODULE,
@@ -60,7 +58,6 @@ struct proto udplitev6_prot = {
60 .compat_setsockopt = compat_udpv6_setsockopt, 58 .compat_setsockopt = compat_udpv6_setsockopt,
61 .compat_getsockopt = compat_udpv6_getsockopt, 59 .compat_getsockopt = compat_udpv6_getsockopt,
62#endif 60#endif
63 REF_PROTO_INUSE(udplitev6)
64}; 61};
65 62
66static struct inet_protosw udplite6_protosw = { 63static struct inet_protosw udplite6_protosw = {
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index 76c747056dd7..00ebd0610be2 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -6513,8 +6513,6 @@ static void sctp_sock_migrate(struct sock *oldsk, struct sock *newsk,
6513} 6513}
6514 6514
6515 6515
6516DEFINE_PROTO_INUSE(sctp)
6517
6518/* This proto struct describes the ULP interface for SCTP. */ 6516/* This proto struct describes the ULP interface for SCTP. */
6519struct proto sctp_prot = { 6517struct proto sctp_prot = {
6520 .name = "SCTP", 6518 .name = "SCTP",
@@ -6544,11 +6542,9 @@ struct proto sctp_prot = {
6544 .enter_memory_pressure = sctp_enter_memory_pressure, 6542 .enter_memory_pressure = sctp_enter_memory_pressure,
6545 .memory_allocated = &sctp_memory_allocated, 6543 .memory_allocated = &sctp_memory_allocated,
6546 .sockets_allocated = &sctp_sockets_allocated, 6544 .sockets_allocated = &sctp_sockets_allocated,
6547 REF_PROTO_INUSE(sctp)
6548}; 6545};
6549 6546
6550#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) 6547#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
6551DEFINE_PROTO_INUSE(sctpv6)
6552 6548
6553struct proto sctpv6_prot = { 6549struct proto sctpv6_prot = {
6554 .name = "SCTPv6", 6550 .name = "SCTPv6",
@@ -6578,6 +6574,5 @@ struct proto sctpv6_prot = {
6578 .enter_memory_pressure = sctp_enter_memory_pressure, 6574 .enter_memory_pressure = sctp_enter_memory_pressure,
6579 .memory_allocated = &sctp_memory_allocated, 6575 .memory_allocated = &sctp_memory_allocated,
6580 .sockets_allocated = &sctp_sockets_allocated, 6576 .sockets_allocated = &sctp_sockets_allocated,
6581 REF_PROTO_INUSE(sctpv6)
6582}; 6577};
6583#endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */ 6578#endif /* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */