From: Josef Sipek Signed-off-by: Josef Sipek Signed-off-by: Andrew Morton --- arch/s390/hypfs/inode.c | 4 ++-- arch/s390/kernel/debug.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN arch/s390/hypfs/inode.c~struct-path-convert-s390 arch/s390/hypfs/inode.c --- a/arch/s390/hypfs/inode.c~struct-path-convert-s390 +++ a/arch/s390/hypfs/inode.c @@ -109,7 +109,7 @@ static void hypfs_drop_inode(struct inod static int hypfs_open(struct inode *inode, struct file *filp) { - char *data = filp->f_dentry->d_inode->i_private; + char *data = filp->f_path.dentry->d_inode->i_private; struct hypfs_sb_info *fs_info; if (filp->f_mode & FMODE_WRITE) { @@ -174,7 +174,7 @@ static ssize_t hypfs_aio_write(struct ki struct hypfs_sb_info *fs_info; size_t count = iov_length(iov, nr_segs); - sb = iocb->ki_filp->f_dentry->d_inode->i_sb; + sb = iocb->ki_filp->f_path.dentry->d_inode->i_sb; fs_info = sb->s_fs_info; /* * Currently we only allow one update per second for two reasons: diff -puN arch/s390/kernel/debug.c~struct-path-convert-s390 arch/s390/kernel/debug.c --- a/arch/s390/kernel/debug.c~struct-path-convert-s390 +++ a/arch/s390/kernel/debug.c @@ -603,13 +603,13 @@ debug_open(struct inode *inode, struct f debug_info_t *debug_info, *debug_info_snapshot; down(&debug_lock); - debug_info = file->f_dentry->d_inode->i_private; + debug_info = file->f_path.dentry->d_inode->i_private; /* find debug view */ for (i = 0; i < DEBUG_MAX_VIEWS; i++) { if (!debug_info->views[i]) continue; else if (debug_info->debugfs_entries[i] == - file->f_dentry) { + file->f_path.dentry) { goto found; /* found view ! */ } } _