From: Josef Sipek Signed-off-by: Josef Sipek Signed-off-by: Andrew Morton --- drivers/s390/block/dasd_ioctl.c | 2 +- drivers/s390/char/fs3270.c | 4 ++-- drivers/s390/char/tape_char.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff -puN drivers/s390/block/dasd_ioctl.c~struct-path-convert-s390-drivers drivers/s390/block/dasd_ioctl.c --- a/drivers/s390/block/dasd_ioctl.c~struct-path-convert-s390-drivers +++ a/drivers/s390/block/dasd_ioctl.c @@ -430,7 +430,7 @@ dasd_compat_ioctl(struct file *filp, uns 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 -puN drivers/s390/char/fs3270.c~struct-path-convert-s390-drivers drivers/s390/char/fs3270.c --- a/drivers/s390/char/fs3270.c~struct-path-convert-s390-drivers +++ a/drivers/s390/char/fs3270.c @@ -419,9 +419,9 @@ fs3270_open(struct inode *inode, struct 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 -puN drivers/s390/char/tape_char.c~struct-path-convert-s390-drivers drivers/s390/char/tape_char.c --- a/drivers/s390/char/tape_char.c~struct-path-convert-s390-drivers +++ a/drivers/s390/char/tape_char.c @@ -298,13 +298,13 @@ tapechar_open (struct inode *inode, stru 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"); _