projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more file_inode() open-coded instances
[deliverable/linux.git]
/
arch
/
x86
/
kernel
/
msr.c
diff --git
a/arch/x86/kernel/msr.c
b/arch/x86/kernel/msr.c
index 4929502c1372db979d7e1b176b22a9981e8ec96e..ce130493b8020aa05edf555234ebfd8cac9e9f9a 100644
(file)
--- a/
arch/x86/kernel/msr.c
+++ b/
arch/x86/kernel/msr.c
@@
-71,7
+71,7
@@
static ssize_t msr_read(struct file *file, char __user *buf,
u32 __user *tmp = (u32 __user *) buf;
u32 data[2];
u32 reg = *ppos;
u32 __user *tmp = (u32 __user *) buf;
u32 data[2];
u32 reg = *ppos;
- int cpu = iminor(file
->f_path.dentry->d_inode
);
+ int cpu = iminor(file
_inode(file)
);
int err = 0;
ssize_t bytes = 0;
int err = 0;
ssize_t bytes = 0;
@@
-99,7
+99,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;
const u32 __user *tmp = (const u32 __user *)buf;
u32 data[2];
u32 reg = *ppos;
- int cpu = iminor(file
->f_path.dentry->d_inode
);
+ int cpu = iminor(file
_inode(file)
);
int err = 0;
ssize_t bytes = 0;
int err = 0;
ssize_t bytes = 0;
@@
-125,7
+125,7
@@
static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
{
u32 __user *uregs = (u32 __user *)arg;
u32 regs[8];
{
u32 __user *uregs = (u32 __user *)arg;
u32 regs[8];
- int cpu = iminor(file
->f_path.dentry->d_inode
);
+ int cpu = iminor(file
_inode(file)
);
int err;
switch (ioc) {
int err;
switch (ioc) {
@@
-171,13
+171,12
@@
static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
static int msr_open(struct inode *inode, struct file *file)
{
static int msr_open(struct inode *inode, struct file *file)
{
- unsigned int cpu;
+ unsigned int cpu
= iminor(file_inode(file))
;
struct cpuinfo_x86 *c;
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
struct cpuinfo_x86 *c;
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
- cpu = iminor(file->f_path.dentry->d_inode);
if (cpu >= nr_cpu_ids || !cpu_online(cpu))
return -ENXIO; /* No such CPU */
if (cpu >= nr_cpu_ids || !cpu_online(cpu))
return -ENXIO; /* No such CPU */
This page took
0.028105 seconds
and
5
git commands to generate.