From: Josef "Jeff" Sipek Change all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the i386 arch code. Signed-off-by: Josef "Jeff" Sipek Signed-off-by: Andrew Morton --- arch/i386/kernel/cpuid.c | 4 ++-- arch/i386/kernel/msr.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff -puN arch/i386/kernel/cpuid.c~i386-change-uses-of-f_dentry-vfsmnt-to-use-f_path arch/i386/kernel/cpuid.c --- a/arch/i386/kernel/cpuid.c~i386-change-uses-of-f_dentry-vfsmnt-to-use-f_path +++ a/arch/i386/kernel/cpuid.c @@ -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 -puN arch/i386/kernel/msr.c~i386-change-uses-of-f_dentry-vfsmnt-to-use-f_path arch/i386/kernel/msr.c --- a/arch/i386/kernel/msr.c~i386-change-uses-of-f_dentry-vfsmnt-to-use-f_path +++ a/arch/i386/kernel/msr.c @@ -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)) _