[SOCK][NETNS]: Add a struct net argument to sock_prot_inuse_add and _get.

This counter is about to become per-proto-and-per-net, so we'll need 
two arguments to determine which cell in this "table" to work with.

All the places, but proc already pass proper net to it - proc will be
tuned a bit later.

Some indentation with spaces in proc files is done to keep the file
coding style consistent.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 12 insertions, 10 deletions

diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
index 340c7d42b83a..580014aea4d6 100644
--- a/net/ipv6/inet6_hashtables.c
+++ b/net/ipv6/inet6_hashtables.c
@@ -43,7 +43,7 @@ void __inet6_hash(struct sock *sk)
         }
 
         __sk_add_node(sk, list);
-        sock_prot_inuse_add(sk->sk_prot, 1);
+        sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
         write_unlock(lock);
 }
 EXPORT_SYMBOL(__inet6_hash);
@@ -204,7 +204,7 @@ unique:
         BUG_TRAP(sk_unhashed(sk));
         __sk_add_node(sk, &head->chain);
         sk->sk_hash = hash;
-        sock_prot_inuse_add(sk->sk_prot, 1);
+        sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
         write_unlock(lock);
 
         if (twp != NULL) {
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index d3d93d752e10..4195ac92345e 100644
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -155,10 +155,11 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 
                         if (sk->sk_protocol == IPPROTO_TCP) {
                                 struct inet_connection_sock *icsk = inet_csk(sk);
+                                struct net *net = sock_net(sk);
 
                                 local_bh_disable();
-                                sock_prot_inuse_add(sk->sk_prot, -1);
-                                sock_prot_inuse_add(&tcp_prot, 1);
+                                sock_prot_inuse_add(net, sk->sk_prot, -1);
+                                sock_prot_inuse_add(net, &tcp_prot, 1);
                                 local_bh_enable();
                                 sk->sk_prot = &tcp_prot;
                                 icsk->icsk_af_ops = &ipv4_specific;
@@ -167,12 +168,13 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
                                 tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
                         } else {
                                 struct proto *prot = &udp_prot;
+                                struct net *net = sock_net(sk);
 
                                 if (sk->sk_protocol == IPPROTO_UDPLITE)
                                         prot = &udplite_prot;
                                 local_bh_disable();
-                                sock_prot_inuse_add(sk->sk_prot, -1);
-                                sock_prot_inuse_add(prot, 1);
+                                sock_prot_inuse_add(net, sk->sk_prot, -1);
+                                sock_prot_inuse_add(net, prot, 1);
                                 local_bh_enable();
                                 sk->sk_prot = prot;
                                 sk->sk_socket->ops = &inet_dgram_ops;
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 364dc332532c..4b9d5a905725 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -36,13 +36,13 @@ static struct proc_dir_entry *proc_net_devsnmp6;
 static int sockstat6_seq_show(struct seq_file *seq, void *v)
 {
         seq_printf(seq, "TCP6: inuse %d\n",
-                       sock_prot_inuse_get(&tcpv6_prot));
+                       sock_prot_inuse_get(&init_net, &tcpv6_prot));
         seq_printf(seq, "UDP6: inuse %d\n",
-                       sock_prot_inuse_get(&udpv6_prot));
+                       sock_prot_inuse_get(&init_net, &udpv6_prot));
         seq_printf(seq, "UDPLITE6: inuse %d\n",
-                        sock_prot_inuse_get(&udplitev6_prot));
+                        sock_prot_inuse_get(&init_net, &udplitev6_prot));
         seq_printf(seq, "RAW6: inuse %d\n",
-                       sock_prot_inuse_get(&rawv6_prot));
+                       sock_prot_inuse_get(&init_net, &rawv6_prot));
         seq_printf(seq, "FRAG6: inuse %d memory %d\n",
                        ip6_frag_nqueues(&init_net), ip6_frag_mem(&init_net));
         return 0;