Messages in this thread Patch in this message | | | Subject | [PATCH 12 of 23] i386: change uses of f_{dentry, vfsmnt} to use f_path | Date | Sat, 21 Oct 2006 02:17:37 -0400 | From | Josef "Jeff" Sipek <> |
| |
From: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
This patch changes all the uses of f_{dentry,vfsmnt} to f_path.{dentry,mnt} in the i386 arch code.
Signed-off-by: Josef "Jeff" Sipek <jsipek@cs.sunysb.edu>
---
2 files changed, 5 insertions(+), 5 deletions(-) arch/i386/kernel/cpuid.c | 4 ++-- arch/i386/kernel/msr.c | 6 +++---
diff --git a/arch/i386/kernel/cpuid.c b/arch/i386/kernel/cpuid.c --- a/arch/i386/kernel/cpuid.c +++ b/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 --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c --- a/arch/i386/kernel/msr.c +++ b/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))
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |