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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
net
/
unix
/
garbage.c
diff --git
a/net/unix/garbage.c
b/net/unix/garbage.c
index
746c2f4
..
f14ad66
100644
(file)
--- a/
net/unix/garbage.c
+++ b/
net/unix/garbage.c
@@
-96,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;
- struct inode *inode = filp->f_dentry->d_inode;
+ struct inode *inode = filp->f_
path.
dentry->d_inode;
/*
* Socket ?