From: Josef Sipek <jsipek@fsl.cs.sunysb.edu>

Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 net/netlink/af_netlink.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN net/netlink/af_netlink.c~struct-path-convert-netlink net/netlink/af_netlink.c
--- a/net/netlink/af_netlink.c~struct-path-convert-netlink
+++ a/net/netlink/af_netlink.c
@@ -699,7 +699,7 @@ static struct sock *netlink_getsockbypid
 
 struct sock *netlink_getsockbyfilp(struct file *filp)
 {
-	struct inode *inode = filp->f_dentry->d_inode;
+	struct inode *inode = filp->f_path.dentry->d_inode;
 	struct sock *sock;
 
 	if (!S_ISSOCK(inode->i_mode))
_