[PATCH] struct path: convert v4l

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, 4 insertions, 4 deletions

diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c
index d82a488f12a6..f065ad12cc61 100644
--- a/drivers/media/video/compat_ioctl32.c
+++ b/drivers/media/video/compat_ioctl32.c
@@ -118,7 +118,7 @@ static int native_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 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 --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index d424a4129d69..41ec0c4b35a2 100644
--- a/drivers/media/video/videodev.c
+++ b/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 --git a/drivers/media/video/zoran_procfs.c b/drivers/media/video/zoran_procfs.c
index c7f6f6488360..c374c76b3753 100644
--- a/drivers/media/video/zoran_procfs.c
+++ b/drivers/media/video/zoran_procfs.c
@@ -144,7 +144,7 @@ static int zoran_open(struct inode *inode, struct file *file)
 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 *file, const char __user *buffer,
         }
         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);