From f35ddea6ae5a019bb355fd12e8c3e011ff026024 Mon Sep 17 00:00:00 2001
From: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Date: Fri, 8 Dec 2006 02:36:55 -0800
Subject: [PATCH] --- yaml --- r: 43555 b: refs/heads/master c:
 6c648be6f4183775679c1f2cc4d094128f104fb2 h: refs/heads/master i:   43553:
 3db0d755934c39250bc594ae7c62eee339489a53   43551:
 24ff7c872559c32370117b85215a090a02dbab80 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/block/acsi_slm.c | 4 ++--
 trunk/drivers/block/cciss.c    | 2 +-
 trunk/drivers/block/loop.c     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4489baf05e56..50b6e9ba2f46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5a20b6c26efb58c2ba2ebebcc65748f5b92f662
+refs/heads/master: 6c648be6f4183775679c1f2cc4d094128f104fb2
diff --git a/trunk/drivers/block/acsi_slm.c b/trunk/drivers/block/acsi_slm.c
index 8e41c87b026e..e04be94d195c 100644
--- a/trunk/drivers/block/acsi_slm.c
+++ b/trunk/drivers/block/acsi_slm.c
@@ -363,7 +363,7 @@ static ssize_t slm_read( struct file *file, char *buf, size_t count,
 						 loff_t *ppos )
 
 {
-	struct inode *node = file->f_dentry->d_inode;
+	struct inode *node = file->f_path.dentry->d_inode;
 	unsigned long page;
 	int length;
 	int end;
@@ -618,7 +618,7 @@ static ssize_t slm_write( struct file *file, const char *buf, size_t count,
 						  loff_t *ppos )
 
 {
-	struct inode *node = file->f_dentry->d_inode;
+	struct inode *node = file->f_path.dentry->d_inode;
 	int		device = iminor(node);
 	int		n, filled, w, h;
 
diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c
index 892e092afe9a..ee159edb6b88 100644
--- a/trunk/drivers/block/cciss.c
+++ b/trunk/drivers/block/cciss.c
@@ -535,7 +535,7 @@ static int do_ioctl(struct file *f, unsigned cmd, unsigned long arg)
 {
 	int ret;
 	lock_kernel();
-	ret = cciss_ioctl(f->f_dentry->d_inode, f, cmd, arg);
+	ret = cciss_ioctl(f->f_path.dentry->d_inode, f, cmd, arg);
 	unlock_kernel();
 	return ret;
 }
diff --git a/trunk/drivers/block/loop.c b/trunk/drivers/block/loop.c
index beab6d2643cb..6b5b64207407 100644
--- a/trunk/drivers/block/loop.c
+++ b/trunk/drivers/block/loop.c
@@ -1000,7 +1000,7 @@ loop_get_status(struct loop_device *lo, struct loop_info64 *info)
 
 	if (lo->lo_state != Lo_bound)
 		return -ENXIO;
-	error = vfs_getattr(file->f_vfsmnt, file->f_dentry, &stat);
+	error = vfs_getattr(file->f_path.mnt, file->f_path.dentry, &stat);
 	if (error)
 		return error;
 	memset(info, 0, sizeof(*info));
@@ -1287,7 +1287,7 @@ loop_get_status_compat(struct loop_device *lo,
 
 static long lo_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
-	struct inode *inode = file->f_dentry->d_inode;
+	struct inode *inode = file->f_path.dentry->d_inode;
 	struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
 	int err;