diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /net/unix/garbage.c | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 ? |