From: Josef Sipek Signed-off-by: Josef Sipek Signed-off-by: Andrew Morton --- drivers/media/video/compat_ioctl32.c | 2 +- drivers/media/video/videodev.c | 2 +- drivers/media/video/zoran_procfs.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/media/video/compat_ioctl32.c~struct-path-convert-v4l drivers/media/video/compat_ioctl32.c --- a/drivers/media/video/compat_ioctl32.c~struct-path-convert-v4l +++ a/drivers/media/video/compat_ioctl32.c @@ -118,7 +118,7 @@ static int native_ioctl(struct file *fil ret = file->f_op->unlocked_ioctl(file, cmd, arg); else if (file->f_op->ioctl) { lock_kernel(); - ret = file->f_op->ioctl(file->f_dentry->d_inode, file, cmd, arg); + ret = file->f_op->ioctl(file->f_path.dentry->d_inode, file, cmd, arg); unlock_kernel(); } diff -puN drivers/media/video/videodev.c~struct-path-convert-v4l drivers/media/video/videodev.c --- a/drivers/media/video/videodev.c~struct-path-convert-v4l +++ a/drivers/media/video/videodev.c @@ -105,7 +105,7 @@ static DEFINE_MUTEX(videodev_lock); struct video_device* video_devdata(struct file *file) { - return video_device[iminor(file->f_dentry->d_inode)]; + return video_device[iminor(file->f_path.dentry->d_inode)]; } /* diff -puN drivers/media/video/zoran_procfs.c~struct-path-convert-v4l drivers/media/video/zoran_procfs.c --- a/drivers/media/video/zoran_procfs.c~struct-path-convert-v4l +++ a/drivers/media/video/zoran_procfs.c @@ -144,7 +144,7 @@ static int zoran_open(struct inode *inod static ssize_t zoran_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos) { - struct zoran *zr = PDE(file->f_dentry->d_inode)->data; + struct zoran *zr = PDE(file->f_path.dentry->d_inode)->data; char *string, *sp; char *line, *ldelim, *varname, *svar, *tdelim; @@ -165,7 +165,7 @@ static ssize_t zoran_write(struct file * } string[count] = 0; dprintk(4, KERN_INFO "%s: write_proc: name=%s count=%zu zr=%p\n", - ZR_DEVNAME(zr), file->f_dentry->d_name.name, count, zr); + ZR_DEVNAME(zr), file->f_path.dentry->d_name.name, count, zr); ldelim = " \t\n"; tdelim = "="; line = strpbrk(sp, ldelim); _