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


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

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

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


desc
@@


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


1.1.2.1
log
@Move patches already in mm into a subdir
@
text
@a0 56
i386: change uses of f_{dentry,vfsmnt} to use f_path

This patch changes all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt}
in the i386 arch code.

diff -r 6ccf6eab7f32 arch/i386/kernel/cpuid.c
--- a/arch/i386/kernel/cpuid.c	Fri Oct 20 19:04:06 2006 -0400
+++ b/arch/i386/kernel/cpuid.c	Fri Oct 20 19:11:03 2006 -0400
@@@@ -117,7 +117,7 @@@@ static ssize_t cpuid_read(struct file *f
 	char __user *tmp = buf;
 	u32 data[4];
 	u32 reg = *ppos;
-	int cpu = iminor(file->f_dentry->d_inode);
+	int cpu = iminor(file->f_path.dentry->d_inode);
 
 	if (count % 16)
 		return -EINVAL;	/* Invalid chunk size */
@@@@ -135,7 +135,7 @@@@ static ssize_t cpuid_read(struct file *f
 
 static int cpuid_open(struct inode *inode, struct file *file)
 {
-	unsigned int cpu = iminor(file->f_dentry->d_inode);
+	unsigned int cpu = iminor(file->f_path.dentry->d_inode);
 	struct cpuinfo_x86 *c = &(cpu_data)[cpu];
 
 	if (cpu >= NR_CPUS || !cpu_online(cpu))
diff -r 6ccf6eab7f32 arch/i386/kernel/msr.c
--- a/arch/i386/kernel/msr.c	Fri Oct 20 19:04:06 2006 -0400
+++ b/arch/i386/kernel/msr.c	Sat Oct 21 00:01:47 2006 -0400
@@@@ -172,7 +172,7 @@@@ static ssize_t msr_read(struct file *fil
 	u32 __user *tmp = (u32 __user *) buf;
 	u32 data[2];
 	u32 reg = *ppos;
-	int cpu = iminor(file->f_dentry->d_inode);
+	int cpu = iminor(file->f_path.dentry->d_inode);
 	int err;
 
 	if (count % 8)
@@@@ -197,7 +197,7 @@@@ static ssize_t msr_write(struct file *fi
 	u32 data[2];
 	size_t rv;
 	u32 reg = *ppos;
-	int cpu = iminor(file->f_dentry->d_inode);
+	int cpu = iminor(file->f_path.dentry->d_inode);
 	int err;
 
 	if (count % 8)
@@@@ -217,7 +217,7 @@@@ static ssize_t msr_write(struct file *fi
 
 static int msr_open(struct inode *inode, struct file *file)
 {
-	unsigned int cpu = iminor(file->f_dentry->d_inode);
+	unsigned int cpu = iminor(file->f_path.dentry->d_inode);
 	struct cpuinfo_x86 *c = &(cpu_data)[cpu];
 
 	if (cpu >= NR_CPUS || !cpu_online(cpu))
@


1.1.2.2
log
@Removed many patches already in vanilla
@
text
@@


