new helper: file_inode(file)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 11 insertions, 11 deletions

diff --git a/arch/powerpc/kernel/proc_powerpc.c b/arch/powerpc/kernel/proc_powerpc.c
index c8ae3714e79b..f19d0bdc3241 100644
--- a/arch/powerpc/kernel/proc_powerpc.c
+++ b/arch/powerpc/kernel/proc_powerpc.c
@@ -32,7 +32,7 @@
 static loff_t page_map_seek( struct file *file, loff_t off, int whence)
 {
         loff_t new;
-        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file_inode(file));
 
         switch(whence) {
         case 0:
@@ -55,13 +55,13 @@ static loff_t page_map_seek( struct file *file, loff_t off, int whence)
 static ssize_t page_map_read( struct file *file, char __user *buf, size_t nbytes,
                               loff_t *ppos)
 {
-        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file_inode(file));
         return simple_read_from_buffer(buf, nbytes, ppos, dp->data, dp->size);
 }
 
 static int page_map_mmap( struct file *file, struct vm_area_struct *vma )
 {
-        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file_inode(file));
 
         if ((vma->vm_end - vma->vm_start) > dp->size)
                 return -EINVAL;
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
index 8329190312c1..c642f0132988 100644
--- a/arch/powerpc/kernel/rtas_flash.c
+++ b/arch/powerpc/kernel/rtas_flash.c
@@ -191,7 +191,7 @@ static void free_flash_list(struct flash_block_list *f)
 
 static int rtas_flash_release(struct inode *inode, struct file *file)
 {
-        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file_inode(file));
         struct rtas_update_flash_t *uf;
         
         uf = (struct rtas_update_flash_t *) dp->data;
@@ -253,7 +253,7 @@ static void get_flash_status_msg(int status, char *buf)
 static ssize_t rtas_flash_read(struct file *file, char __user *buf,
                                size_t count, loff_t *ppos)
 {
-        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file_inode(file));
         struct rtas_update_flash_t *uf;
         char msg[RTAS_MSG_MAXLEN];
 
@@ -282,7 +282,7 @@ void rtas_block_ctor(void *ptr)
 static ssize_t rtas_flash_write(struct file *file, const char __user *buffer,
                                 size_t count, loff_t *off)
 {
-        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file_inode(file));
         struct rtas_update_flash_t *uf;
         char *p;
         int next_free;
@@ -374,7 +374,7 @@ static void manage_flash(struct rtas_manage_flash_t *args_buf)
 static ssize_t manage_flash_read(struct file *file, char __user *buf,
                                size_t count, loff_t *ppos)
 {
-        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file_inode(file));
         struct rtas_manage_flash_t *args_buf;
         char msg[RTAS_MSG_MAXLEN];
         int msglen;
@@ -391,7 +391,7 @@ static ssize_t manage_flash_read(struct file *file, char __user *buf,
 static ssize_t manage_flash_write(struct file *file, const char __user *buf,
                                 size_t count, loff_t *off)
 {
-        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file_inode(file));
         struct rtas_manage_flash_t *args_buf;
         const char reject_str[] = "0";
         const char commit_str[] = "1";
@@ -462,7 +462,7 @@ static int get_validate_flash_msg(struct rtas_validate_flash_t *args_buf,
 static ssize_t validate_flash_read(struct file *file, char __user *buf,
                                size_t count, loff_t *ppos)
 {
-        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file_inode(file));
         struct rtas_validate_flash_t *args_buf;
         char msg[RTAS_MSG_MAXLEN];
         int msglen;
@@ -477,7 +477,7 @@ static ssize_t validate_flash_read(struct file *file, char __user *buf,
 static ssize_t validate_flash_write(struct file *file, const char __user *buf,
                                     size_t count, loff_t *off)
 {
-        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file_inode(file));
         struct rtas_validate_flash_t *args_buf;
         int rc;
 
@@ -526,7 +526,7 @@ done:
 
 static int validate_flash_release(struct inode *inode, struct file *file)
 {
-        struct proc_dir_entry *dp = PDE(file->f_path.dentry->d_inode);
+        struct proc_dir_entry *dp = PDE(file_inode(file));
         struct rtas_validate_flash_t *args_buf;
 
         args_buf = (struct rtas_validate_flash_t *) dp->data;