git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netfilter: remove IPvX specific parts from nf_conntrack_l4proto.h
[safe/jmp/linux-2.6]
/
include
/
net
/
af_unix.h
diff --git
a/include/net/af_unix.h
b/include/net/af_unix.h
index
a1c805d
..
1614d78
100644
(file)
--- a/
include/net/af_unix.h
+++ b/
include/net/af_unix.h
@@
-9,6
+9,7
@@
extern void unix_inflight(struct file *fp);
extern void unix_notinflight(struct file *fp);
extern void unix_gc(void);
extern void unix_inflight(struct file *fp);
extern void unix_notinflight(struct file *fp);
extern void unix_gc(void);
+extern void wait_for_unix_gc(void);
#define UNIX_HASH_SIZE 256
#define UNIX_HASH_SIZE 256
@@
-51,20
+52,20
@@
struct unix_sock {
struct sock *peer;
struct sock *other;
struct list_head link;
struct sock *peer;
struct sock *other;
struct list_head link;
- atomic_
t
inflight;
+ atomic_
long_t
inflight;
spinlock_t lock;
unsigned int gc_candidate : 1;
spinlock_t lock;
unsigned int gc_candidate : 1;
+ unsigned int gc_maybe_cycle : 1;
wait_queue_head_t peer_wait;
};
#define unix_sk(__sk) ((struct unix_sock *)__sk)
#ifdef CONFIG_SYSCTL
wait_queue_head_t peer_wait;
};
#define unix_sk(__sk) ((struct unix_sock *)__sk)
#ifdef CONFIG_SYSCTL
-extern int sysctl_unix_max_dgram_qlen;
-extern void unix_sysctl_register(void);
-extern void unix_sysctl_unregister(void);
+extern int unix_sysctl_register(struct net *net);
+extern void unix_sysctl_unregister(struct net *net);
#else
#else
-static inline
void unix_sysctl_register(void) {
}
-static inline void unix_sysctl_unregister(
void
) {}
+static inline
int unix_sysctl_register(struct net *net) { return 0;
}
+static inline void unix_sysctl_unregister(
struct net *net
) {}
#endif
#endif
#endif
#endif
#endif
#endif