[PATCH] net: af_unix should update its inuse counter

[PATCH] net: af_unix should update its inuse counter

[Eric Dumazet]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

This patch is a preparation to namespace conversion of /proc/net/protocols

In order to have relevant information for UNIX protocol, we should use
sock_prot_inuse_add() to update a (percpu and pernamespace) counter of
inuse sockets.

Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
---
 net/unix/af_unix.c |    4 ++++
 1 files changed, 4 insertions(+)

[-- Attachment #2: af_unix_inuse.patch --]
[-- Type: text/plain, Size: 679 bytes --]

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index a1eb596..36856ca 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -361,6 +361,7 @@ static void unix_sock_destructor(struct sock *sk)
 		unix_release_addr(u->addr);
 
 	atomic_dec(&unix_nr_socks);
+	sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
 #ifdef UNIX_REFCNT_DEBUG
 	printk(KERN_DEBUG "UNIX %p is destroyed, %d are still alive.\n", sk,
 		atomic_read(&unix_nr_socks));
@@ -612,6 +613,9 @@ static struct sock *unix_create1(struct net *net, struct socket *sock)
 out:
 	if (sk == NULL)
 		atomic_dec(&unix_nr_socks);
+	else
+		sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
+		
 	return sk;
 }
 

Re: [PATCH] net: af_unix should update its inuse counter

[David Miller]

From: Eric Dumazet <dada1@cosmosbay.com>
Date: Mon, 17 Nov 2008 11:09:33 +0100

Applied, thanks Eric.

> +	else
> +		sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
> +		

That last line had trailing whitespace, which I fixed up.