head	1.1;
access;
symbols
	LKML-branch:1.1.0.2;
locks; strict;
comment	@# @;


1.1
date	2006.10.24.04.54.58;	author jsipek;	state dead;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2006.10.24.04.54.58;	author jsipek;	state Exp;
branches;
next	1.1.2.2;

1.1.2.2
date	2006.10.24.07.45.06;	author jsipek;	state dead;
branches;
next	;


desc
@@


1.1
log
@file media was initially added on branch LKML-branch.
@
text
@@


1.1.2.1
log
@Fix remainder of the kernel's f_{dentry,vfsmnt} usage
@
text
@a0 46
diff -r ed8030e0f7d4 drivers/media/video/compat_ioctl32.c
--- a/drivers/media/video/compat_ioctl32.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/media/video/compat_ioctl32.c	Mon Oct 23 23:25:55 2006 -0400
@@@@ -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 -r ed8030e0f7d4 drivers/media/video/videodev.c
--- a/drivers/media/video/videodev.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/media/video/videodev.c	Mon Oct 23 23:25:58 2006 -0400
@@@@ -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 -r ed8030e0f7d4 drivers/media/video/zoran_procfs.c
--- a/drivers/media/video/zoran_procfs.c	Mon Oct 23 15:11:02 2006 -0400
+++ b/drivers/media/video/zoran_procfs.c	Mon Oct 23 23:25:58 2006 -0400
@@@@ -144,7 +144,7 @@@@ static ssize_t zoran_write(struct 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 *
 	}
 	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);

@


1.1.2.2
log
@reorder, rename and add descriptions to the remainder of f_{dentry,vfsmnt}
patches
@
text
@@


