diff --git a/[refs] b/[refs] index 8fdff353929f..70b870cbaf4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 763454d6108ad1c6d4e1013321aef8bf5efb3a4f +refs/heads/master: 592ccbf9fba665031765d9bb0f6c1ede1fa62f96 diff --git a/trunk/net/unix/garbage.c b/trunk/net/unix/garbage.c index 746c2f4a5fa6..f14ad6635fcc 100644 --- a/trunk/net/unix/garbage.c +++ b/trunk/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 ?