X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvs_socket.h;h=d95fcd30480c2da953ea2af833e2b9952ffe3777;hb=refs%2Fheads%2Fvserver;hp=c9c624442593fac6ce6c075a465da7f4503b87b0;hpb=76828883507a47dae78837ab5dec5a5b4513c667;p=linux-2.6.git

diff --git a/include/linux/vs_socket.h b/include/linux/vs_socket.h
index c9c624442..d95fcd304 100644
--- a/include/linux/vs_socket.h
+++ b/include/linux/vs_socket.h
@@ -1,13 +1,15 @@
-#ifndef _VX_VS_SOCKET_H
-#define _VX_VS_SOCKET_H
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
 
 #include "vserver/debug.h"
+#include "vserver/base.h"
+#include "vserver/cacct.h"
+#include "vserver/context.h"
 
 
 /* socket accounting */
 
 #include <linux/socket.h>
-#include <linux/vserver/cacct.h>
 
 static inline int vx_sock_type(int family)
 {
@@ -36,8 +38,8 @@ static inline void __vx_acc_sock(struct vx_info *vxi,
 	if (vxi) {
 		int type = vx_sock_type(family);
 
-		atomic_inc(&vxi->cacct.sock[type][pos].count);
-		atomic_add(size, &vxi->cacct.sock[type][pos].total);
+		atomic_long_inc(&vxi->cacct.sock[type][pos].count);
+		atomic_long_add(size, &vxi->cacct.sock[type][pos].total);
 	}
 }