diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-01 16:39:08 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-01 16:39:08 +0900 |
| commit | fa3c9f3de2504bb09f8ad512f89837751a3eb741 (patch) | |
| tree | 656df0e4ea62d1c5a45bb7bfd1b4714f4936d63b /include/net | |
| parent | 193006f7e3b1abd42d7a3677b54fa2996461a842 (diff) | |
| parent | 55661fc1f105ed75852e937bf8ea408270eb0cca (diff) | |
| download | linux-next-fa3c9f3de2504bb09f8ad512f89837751a3eb741.tar.gz | |
Merge branch 'sh/cachetlb' into sh-fixes-for-linus
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/af_unix.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 90c9e2872f27..18e5c3f67580 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -10,6 +10,7 @@ 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); +extern struct sock *unix_get_socket(struct file *filp); #define UNIX_HASH_SIZE 256 @@ -56,6 +57,7 @@ struct unix_sock { spinlock_t lock; unsigned int gc_candidate : 1; unsigned int gc_maybe_cycle : 1; + unsigned char recursion_level; struct socket_wq peer_wq; }; #define unix_sk(__sk) ((struct unix_sock *)__sk) |