Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aab4c5a5 authored by Josef "Jeff" Sipek's avatar Josef "Jeff" Sipek Committed by Linus Torvalds
Browse files

[PATCH] i386: change uses of f_{dentry, vfsmnt} to use f_path 



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

Signed-off-by: default avatarJosef "Jeff" Sipek <jsipek@cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 20d29372

arch/i386/kernel/cpuid.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static ssize_t cpuid_read(struct file *file, char __user *buf, 
	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 */
@@ -134,7 +134,7 @@ static ssize_t cpuid_read(struct file *file, char __user *buf, 


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))

arch/i386/kernel/msr.c

+3 −3
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static ssize_t msr_read(struct file *file, char __user * buf, 
	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)
@@ -196,7 +196,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf, 
	const u32 __user *tmp = (const 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)
@@ -216,7 +216,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf, 


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))