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

 drivers/ieee1394/ieee1394_core.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/ieee1394/ieee1394_core.h~struct-path-convert-ieee1394 drivers/ieee1394/ieee1394_core.h
--- a/drivers/ieee1394/ieee1394_core.h~struct-path-convert-ieee1394
+++ a/drivers/ieee1394/ieee1394_core.h
@@ -217,7 +217,7 @@ void hpsb_packet_received(struct hpsb_ho
 /* return the index (within a minor number block) of a file */
 static inline unsigned char ieee1394_file_to_instance(struct file *file)
 {
-	return file->f_dentry->d_inode->i_cindex;
+	return file->f_path.dentry->d_inode->i_cindex;
 }
 
 extern int hpsb_disable_irm;
_