[PATCH] struct path: convert s390-drivers

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

3 files changed, 7 insertions, 7 deletions

diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c
index 8fed3603e9ea..758cfb542865 100644
--- a/drivers/s390/block/dasd_ioctl.c
+++ b/drivers/s390/block/dasd_ioctl.c
@@ -430,7 +430,7 @@ dasd_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
         int rval;
 
         lock_kernel();
-        rval = dasd_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
+        rval = dasd_ioctl(filp->f_path.dentry->d_inode, filp, cmd, arg);
         unlock_kernel();
 
         return (rval == -EINVAL) ? -ENOIOCTLCMD : rval;
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index ef205ddd31a4..0893d306ae80 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -419,9 +419,9 @@ fs3270_open(struct inode *inode, struct file *filp)
         struct idal_buffer *ib;
         int minor, rc;
 
-        if (imajor(filp->f_dentry->d_inode) != IBM_FS3270_MAJOR)
+        if (imajor(filp->f_path.dentry->d_inode) != IBM_FS3270_MAJOR)
                 return -ENODEV;
-        minor = iminor(filp->f_dentry->d_inode);
+        minor = iminor(filp->f_path.dentry->d_inode);
         /* Check for minor 0 multiplexer. */
         if (minor == 0) {
                 struct tty_struct *tty;
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 97f75237bed6..31198c8f2718 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -298,13 +298,13 @@ tapechar_open (struct inode *inode, struct file *filp)
         int minor, rc;
 
         DBF_EVENT(6, "TCHAR:open: %i:%i\n",
-                imajor(filp->f_dentry->d_inode),
-                iminor(filp->f_dentry->d_inode));
+                imajor(filp->f_path.dentry->d_inode),
+                iminor(filp->f_path.dentry->d_inode));
 
-        if (imajor(filp->f_dentry->d_inode) != tapechar_major)
+        if (imajor(filp->f_path.dentry->d_inode) != tapechar_major)
                 return -ENODEV;
 
-        minor = iminor(filp->f_dentry->d_inode);
+        minor = iminor(filp->f_path.dentry->d_inode);
         device = tape_get_device(minor / TAPE_MINORS_PER_DEV);
         if (IS_ERR(device)) {
                 DBF_EVENT(3, "TCHAR:open: tape_get_device() failed\n");