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
/
net
/
af_unix.h
diff --git
a/include/net/af_unix.h
b/include/net/af_unix.h
index
b483a03
..
47c8228
100644
(file)
--- a/
include/net/af_unix.h
+++ b/
include/net/af_unix.h
@@
-4,6
+4,7
@@
#include <linux/socket.h>
#include <linux/un.h>
#include <linux/mutex.h>
#include <linux/socket.h>
#include <linux/un.h>
#include <linux/mutex.h>
+#include <linux/vs_base.h>
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
#include <net/sock.h>
extern void unix_inflight(struct file *fp);
@@
-33,7
+34,7
@@
static inline struct sock *next_unix_socket(int *i, struct sock *s)
s = sk_next(s);
if (!s)
s = next_unix_socket_table(i);
s = sk_next(s);
if (!s)
s = next_unix_socket_table(i);
- } while (s && !
vx_check(s->sk_xid, VX_IDENT|VX_WATCH
));
+ } while (s && !
nx_check(s->sk_nid, VS_WATCH_P|VS_IDENT
));
return s;
}
return s;
}