diff --git a/[refs] b/[refs]
index 9d929e44fef9..96dbd522932b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9536ae7205d255bc94616b72910fc6e16c861fe
+refs/heads/master: 17506041de973bdc718b9a255d822e571b12b421
diff --git a/trunk/drivers/block/nbd.c b/trunk/drivers/block/nbd.c
index 7bf2cfbd6285..090796bef78f 100644
--- a/trunk/drivers/block/nbd.c
+++ b/trunk/drivers/block/nbd.c
@@ -537,7 +537,7 @@ static int nbd_ioctl(struct inode *inode, struct file *file,
 		error = -EINVAL;
 		file = fget(arg);
 		if (file) {
-			inode = file->f_dentry->d_inode;
+			inode = file->f_path.dentry->d_inode;
 			if (S_ISSOCK(inode->i_mode)) {
 				lo->file = file;
 				lo->sock = SOCKET_I(inode);