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]
/
net
/
unix
/
garbage.c
diff --git
a/net/unix/garbage.c
b/net/unix/garbage.c
index
411802b
..
f14ad66
100644
(file)
--- a/
net/unix/garbage.c
+++ b/
net/unix/garbage.c
@@
-76,6
+76,7
@@
#include <linux/netdevice.h>
#include <linux/file.h>
#include <linux/proc_fs.h>
#include <linux/netdevice.h>
#include <linux/file.h>
#include <linux/proc_fs.h>
+#include <linux/mutex.h>
#include <net/sock.h>
#include <net/af_unix.h>
#include <net/sock.h>
#include <net/af_unix.h>
@@
-95,7
+96,7
@@
atomic_t unix_tot_inflight = ATOMIC_INIT(0);
static struct sock *unix_get_socket(struct file *filp)
{
struct sock *u_sock = NULL;
static struct sock *unix_get_socket(struct file *filp)
{
struct sock *u_sock = NULL;
- struct inode *inode = filp->f_dentry->d_inode;
+ struct inode *inode = filp->f_
path.
dentry->d_inode;
/*
* Socket ?
/*
* Socket ?
@@
-169,7
+170,7
@@
static void maybe_unmark_and_push(struct sock *x)
void unix_gc(void)
{
void unix_gc(void)
{
- static DE
CLAR
E_MUTEX(unix_gc_sem);
+ static DE
FIN
E_MUTEX(unix_gc_sem);
int i;
struct sock *s;
struct sk_buff_head hitlist;
int i;
struct sock *s;
struct sk_buff_head hitlist;
@@
-179,7
+180,7
@@
void unix_gc(void)
* Avoid a recursive GC.
*/
* Avoid a recursive GC.
*/
- if (
down
_trylock(&unix_gc_sem))
+ if (
!mutex
_trylock(&unix_gc_sem))
return;
spin_lock(&unix_table_lock);
return;
spin_lock(&unix_table_lock);
@@
-308,5
+309,5
@@
void unix_gc(void)
*/
__skb_queue_purge(&hitlist);
*/
__skb_queue_purge(&hitlist);
-
up
(&unix_gc_sem);
+
mutex_unlock
(&unix_gc_sem);
}
}