From 26375595f9b4d5155aad43f9eeeeb2bf562a7648 Mon Sep 17 00:00:00 2001
From: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Date: Fri, 8 Dec 2006 02:37:22 -0800
Subject: [PATCH] --- yaml --- r: 43591 b: refs/heads/master c:
 17506041de973bdc718b9a255d822e571b12b421 h: refs/heads/master i:   43589:
 d1b2b8d89ade75834e230c295c14de4dc37f259d   43587:
 fdce5d8cfe101ed6e297d8b52919a26e615babe3   43583:
 0075d49d7a7933a14b296914a6f94373ea4615c8 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/block/nbd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);