git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipv6: update skb->csum when CE mark is propagated
[pandora-kernel.git]
/
include
/
net
/
af_unix.h
diff --git
a/include/net/af_unix.h
b/include/net/af_unix.h
index
91ab5b0
..
a69bfee
100644
(file)
--- a/
include/net/af_unix.h
+++ b/
include/net/af_unix.h
@@
-6,8
+6,8
@@
#include <linux/mutex.h>
#include <net/sock.h>
#include <linux/mutex.h>
#include <net/sock.h>
-extern void unix_inflight(struct file *fp);
-extern void unix_notinflight(struct file *fp);
+extern void unix_inflight(struct
user_struct *user, struct
file *fp);
+extern void unix_notinflight(struct
user_struct *user, struct
file *fp);
extern void unix_gc(void);
extern void wait_for_unix_gc(void);
extern struct sock *unix_get_socket(struct file *filp);
extern void unix_gc(void);
extern void wait_for_unix_gc(void);
extern struct sock *unix_get_socket(struct file *filp);
@@
-54,10
+54,12
@@
struct unix_sock {
struct list_head link;
atomic_long_t inflight;
spinlock_t lock;
struct list_head link;
atomic_long_t inflight;
spinlock_t lock;
- unsigned int gc_candidate : 1;
- unsigned int gc_maybe_cycle : 1;
unsigned char recursion_level;
unsigned char recursion_level;
+ unsigned long gc_flags;
+#define UNIX_GC_CANDIDATE 0
+#define UNIX_GC_MAYBE_CYCLE 1
struct socket_wq peer_wq;
struct socket_wq peer_wq;
+ wait_queue_t peer_wake;
};
#define unix_sk(__sk) ((struct unix_sock *)__sk)
};
#define unix_sk(__sk) ((struct unix_sock *)__sk)