X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Funix%2Faf_unix.c;h=08432ceda6a037f56e91af9088f3137b89dd5670;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=3493439273d41b042294f265aab706010ffa8878;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 349343927..08432ceda 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -118,6 +118,9 @@
 #include <linux/mount.h>
 #include <net/checksum.h>
 #include <linux/security.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
 
 int sysctl_unix_max_dgram_qlen = 10;
 
@@ -405,6 +408,7 @@ static int unix_release_sock (struct sock *sk, int embrion)
 		mntput(mnt);
 	}
 
+	vx_sock_dec(sk);
 	clr_vx_info(&sk->sk_vx_info);
 	clr_nx_info(&sk->sk_nx_info);
 	sock_put(sk);
@@ -562,8 +566,9 @@ static struct sock * unix_create1(struct socket *sock)
 	sk_set_owner(sk, THIS_MODULE);
 
 	set_vx_info(&sk->sk_vx_info, current->vx_info);
-	set_nx_info(&sk->sk_nx_info, current->nx_info);
 	sk->sk_xid = vx_current_xid();
+	vx_sock_inc(sk);
+	set_nx_info(&sk->sk_nx_info, current->nx_info);
 
 	sk->sk_write_space	= unix_write_space;
 	sk->sk_max_ack_backlog	= sysctl_unix_max_dgram_qlen;
@@ -2042,7 +2047,7 @@ static int __init af_unix_init(void)
         /* allocate our sock slab cache */
         unix_sk_cachep = kmem_cache_create("unix_sock",
 					   sizeof(struct unix_sock), 0,
-					   SLAB_HWCACHE_ALIGN, 0, 0);
+					   SLAB_HWCACHE_ALIGN, NULL, NULL);
         if (!unix_sk_cachep)
                 printk(KERN_CRIT
                         "af_unix_init: Cannot create unix_sock SLAB cache!\n");