diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-23 17:07:38 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-22 23:31:31 -0500 |
commit | 496ad9aa8ef448058e36ca7a787c61f2e63f0f54 (patch) | |
tree | 8f4abde793cd7db5bb8fde6d27ebcacd0e54379a /drivers/pci | |
parent | 57eccb830f1cc93d4b506ba306d8dfa685e0c88f (diff) |
new helper: file_inode(file)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/proc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 9b8505ccc56d..0b009470e6db 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c | |||
@@ -21,7 +21,7 @@ static loff_t | |||
21 | proc_bus_pci_lseek(struct file *file, loff_t off, int whence) | 21 | proc_bus_pci_lseek(struct file *file, loff_t off, int whence) |
22 | { | 22 | { |
23 | loff_t new = -1; | 23 | loff_t new = -1; |
24 | struct inode *inode = file->f_path.dentry->d_inode; | 24 | struct inode *inode = file_inode(file); |
25 | 25 | ||
26 | mutex_lock(&inode->i_mutex); | 26 | mutex_lock(&inode->i_mutex); |
27 | switch (whence) { | 27 | switch (whence) { |
@@ -46,7 +46,7 @@ proc_bus_pci_lseek(struct file *file, loff_t off, int whence) | |||
46 | static ssize_t | 46 | static ssize_t |
47 | proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) | 47 | proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) |
48 | { | 48 | { |
49 | const struct inode *ino = file->f_path.dentry->d_inode; | 49 | const struct inode *ino = file_inode(file); |
50 | const struct proc_dir_entry *dp = PDE(ino); | 50 | const struct proc_dir_entry *dp = PDE(ino); |
51 | struct pci_dev *dev = dp->data; | 51 | struct pci_dev *dev = dp->data; |
52 | unsigned int pos = *ppos; | 52 | unsigned int pos = *ppos; |
@@ -132,7 +132,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp | |||
132 | static ssize_t | 132 | static ssize_t |
133 | proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, loff_t *ppos) | 133 | proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, loff_t *ppos) |
134 | { | 134 | { |
135 | struct inode *ino = file->f_path.dentry->d_inode; | 135 | struct inode *ino = file_inode(file); |
136 | const struct proc_dir_entry *dp = PDE(ino); | 136 | const struct proc_dir_entry *dp = PDE(ino); |
137 | struct pci_dev *dev = dp->data; | 137 | struct pci_dev *dev = dp->data; |
138 | int pos = *ppos; | 138 | int pos = *ppos; |
@@ -212,7 +212,7 @@ struct pci_filp_private { | |||
212 | static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd, | 212 | static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd, |
213 | unsigned long arg) | 213 | unsigned long arg) |
214 | { | 214 | { |
215 | const struct proc_dir_entry *dp = PDE(file->f_dentry->d_inode); | 215 | const struct proc_dir_entry *dp = PDE(file_inode(file)); |
216 | struct pci_dev *dev = dp->data; | 216 | struct pci_dev *dev = dp->data; |
217 | #ifdef HAVE_PCI_MMAP | 217 | #ifdef HAVE_PCI_MMAP |
218 | struct pci_filp_private *fpriv = file->private_data; | 218 | struct pci_filp_private *fpriv = file->private_data; |
@@ -253,7 +253,7 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd, | |||
253 | #ifdef HAVE_PCI_MMAP | 253 | #ifdef HAVE_PCI_MMAP |
254 | static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma) | 254 | static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma) |
255 | { | 255 | { |
256 | struct inode *inode = file->f_path.dentry->d_inode; | 256 | struct inode *inode = file_inode(file); |
257 | const struct proc_dir_entry *dp = PDE(inode); | 257 | const struct proc_dir_entry *dp = PDE(inode); |
258 | struct pci_dev *dev = dp->data; | 258 | struct pci_dev *dev = dp->data; |
259 | struct pci_filp_private *fpriv = file->private_data; | 259 | struct pci_filp_private *fpriv = file->private_data; |