diff options
Diffstat (limited to 'fs/proc/generic.c')
-rw-r--r-- | fs/proc/generic.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c index 4ba03009cf72..853cb877d5f3 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c | |||
@@ -52,7 +52,7 @@ static ssize_t | |||
52 | proc_file_read(struct file *file, char __user *buf, size_t nbytes, | 52 | proc_file_read(struct file *file, char __user *buf, size_t nbytes, |
53 | loff_t *ppos) | 53 | loff_t *ppos) |
54 | { | 54 | { |
55 | struct inode * inode = file->f_dentry->d_inode; | 55 | struct inode * inode = file->f_path.dentry->d_inode; |
56 | char *page; | 56 | char *page; |
57 | ssize_t retval=0; | 57 | ssize_t retval=0; |
58 | int eof=0; | 58 | int eof=0; |
@@ -203,7 +203,7 @@ static ssize_t | |||
203 | proc_file_write(struct file *file, const char __user *buffer, | 203 | proc_file_write(struct file *file, const char __user *buffer, |
204 | size_t count, loff_t *ppos) | 204 | size_t count, loff_t *ppos) |
205 | { | 205 | { |
206 | struct inode *inode = file->f_dentry->d_inode; | 206 | struct inode *inode = file->f_path.dentry->d_inode; |
207 | struct proc_dir_entry * dp; | 207 | struct proc_dir_entry * dp; |
208 | 208 | ||
209 | dp = PDE(inode); | 209 | dp = PDE(inode); |
@@ -432,7 +432,7 @@ int proc_readdir(struct file * filp, | |||
432 | struct proc_dir_entry * de; | 432 | struct proc_dir_entry * de; |
433 | unsigned int ino; | 433 | unsigned int ino; |
434 | int i; | 434 | int i; |
435 | struct inode *inode = filp->f_dentry->d_inode; | 435 | struct inode *inode = filp->f_path.dentry->d_inode; |
436 | int ret = 0; | 436 | int ret = 0; |
437 | 437 | ||
438 | lock_kernel(); | 438 | lock_kernel(); |
@@ -453,7 +453,7 @@ int proc_readdir(struct file * filp, | |||
453 | /* fall through */ | 453 | /* fall through */ |
454 | case 1: | 454 | case 1: |
455 | if (filldir(dirent, "..", 2, i, | 455 | if (filldir(dirent, "..", 2, i, |
456 | parent_ino(filp->f_dentry), | 456 | parent_ino(filp->f_path.dentry), |
457 | DT_DIR) < 0) | 457 | DT_DIR) < 0) |
458 | goto out; | 458 | goto out; |
459 | i++; | 459 | i++; |
@@ -558,7 +558,7 @@ static void proc_kill_inodes(struct proc_dir_entry *de) | |||
558 | file_list_lock(); | 558 | file_list_lock(); |
559 | list_for_each(p, &sb->s_files) { | 559 | list_for_each(p, &sb->s_files) { |
560 | struct file * filp = list_entry(p, struct file, f_u.fu_list); | 560 | struct file * filp = list_entry(p, struct file, f_u.fu_list); |
561 | struct dentry * dentry = filp->f_dentry; | 561 | struct dentry * dentry = filp->f_path.dentry; |
562 | struct inode * inode; | 562 | struct inode * inode; |
563 | const struct file_operations *fops; | 563 | const struct file_operations *fops; |
564 | 564 | ||