git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
vs_socket.h
diff --git
a/include/linux/vs_socket.h
b/include/linux/vs_socket.h
index
c9c6244
..
d95fcd3
100644
(file)
--- a/
include/linux/vs_socket.h
+++ b/
include/linux/vs_socket.h
@@
-1,13
+1,15
@@
-#ifndef _V
X_V
S_SOCKET_H
-#define _V
X_V
S_SOCKET_H
+#ifndef _VS_SOCKET_H
+#define _VS_SOCKET_H
#include "vserver/debug.h"
#include "vserver/debug.h"
+#include "vserver/base.h"
+#include "vserver/cacct.h"
+#include "vserver/context.h"
/* socket accounting */
#include <linux/socket.h>
/* socket accounting */
#include <linux/socket.h>
-#include <linux/vserver/cacct.h>
static inline int vx_sock_type(int family)
{
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);
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);
}
}
}
}