diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 18:13:32 -0500 |
| commit | f0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch) | |
| tree | 2472e94d39f43a9580a6d2d5d92de0b749023263 /net/unix/garbage.c | |
| parent | 0cfea5dd98205f2fa318836da664a7d7df1afbc1 (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Diffstat (limited to 'net/unix/garbage.c')
| -rw-r--r-- | net/unix/garbage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/unix/garbage.c b/net/unix/garbage.c index 746c2f4a5fa6..f14ad6635fcc 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c | |||
| @@ -96,7 +96,7 @@ atomic_t unix_tot_inflight = ATOMIC_INIT(0); | |||
| 96 | static struct sock *unix_get_socket(struct file *filp) | 96 | static struct sock *unix_get_socket(struct file *filp) |
| 97 | { | 97 | { |
| 98 | struct sock *u_sock = NULL; | 98 | struct sock *u_sock = NULL; |
| 99 | struct inode *inode = filp->f_dentry->d_inode; | 99 | struct inode *inode = filp->f_path.dentry->d_inode; |
| 100 | 100 | ||
| 101 | /* | 101 | /* |
| 102 | * Socket ? | 102 | * Socket ? |