4 files changed, 12 insertions, 12 deletions

diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index 8c8c8324f775..5a99e3e0c96d 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -415,7 +415,7 @@ static unsigned int file_poll(struct file *file, poll_table * wait)
         int minor;
         unsigned int mask = 0;
 
-        minor = iminor(file->f_dentry->d_inode);
+        minor = iminor(file->f_path.dentry->d_inode);
 
         poll_wait(file, &channel_wqs[minor].rt_queue, wait);
         poll_wait(file, &channel_wqs[minor].lx_queue, wait);
@@ -437,7 +437,7 @@ static unsigned int file_poll(struct file *file, poll_table * wait)
 static ssize_t file_read(struct file *file, char __user * buffer, size_t count,
                          loff_t * ppos)
 {
-        int minor = iminor(file->f_dentry->d_inode);
+        int minor = iminor(file->f_path.dentry->d_inode);
 
         /* data available? */
         if (!rtlx_read_poll(minor, (file->f_flags & O_NONBLOCK) ? 0 : 1)) {
@@ -454,7 +454,7 @@ static ssize_t file_write(struct file *file, const char __user * buffer,
         struct rtlx_channel *rt;
         DECLARE_WAITQUEUE(wait, current);
 
-        minor = iminor(file->f_dentry->d_inode);
+        minor = iminor(file->f_path.dentry->d_inode);
         rt = &rtlx->channel[minor];
 
         /* any space left... */
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c
index 93c74fefff76..6c2406a93f2b 100644
--- a/arch/mips/kernel/sysirix.c
+++ b/arch/mips/kernel/sysirix.c
@@ -732,7 +732,7 @@ asmlinkage int irix_fstatfs(unsigned int fd, struct irix_statfs __user *buf)
                 goto out;
         }
 
-        error = vfs_statfs(file->f_dentry, &kbuf);
+        error = vfs_statfs(file->f_path.dentry, &kbuf);
         if (error)
                 goto out_f;
 
@@ -1041,7 +1041,7 @@ asmlinkage unsigned long irix_mmap32(unsigned long addr, size_t len, int prot,
                         unsigned long old_pos;
                         long max_size = offset + len;
 
-                        if (max_size > file->f_dentry->d_inode->i_size) {
+                        if (max_size > file->f_path.dentry->d_inode->i_size) {
                                 old_pos = sys_lseek (fd, max_size - 1, 0);
                                 sys_write (fd, (void __user *) "", 1);
                                 sys_lseek (fd, old_pos, 0);
@@ -1406,7 +1406,7 @@ asmlinkage int irix_fstatvfs(int fd, struct irix_statvfs __user *buf)
                 error = -EBADF;
                 goto out;
         }
-        error = vfs_statfs(file->f_dentry, &kbuf);
+        error = vfs_statfs(file->f_path.dentry, &kbuf);
         if (error)
                 goto out_f;
 
@@ -1526,7 +1526,7 @@ asmlinkage int irix_mmap64(struct pt_regs *regs)
                         unsigned long old_pos;
                         long max_size = off2 + len;
 
-                        if (max_size > file->f_dentry->d_inode->i_size) {
+                        if (max_size > file->f_path.dentry->d_inode->i_size) {
                                 old_pos = sys_lseek (fd, max_size - 1, 0);
                                 sys_write (fd, (void __user *) "", 1);
                                 sys_lseek (fd, old_pos, 0);
@@ -1658,7 +1658,7 @@ asmlinkage int irix_fstatvfs64(int fd, struct irix_statvfs __user *buf)
                 error = -EBADF;
                 goto out;
         }
-        error = vfs_statfs(file->f_dentry, &kbuf);
+        error = vfs_statfs(file->f_path.dentry, &kbuf);
         if (error)
                 goto out_f;
 
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 51ddd2166898..666bef484dcb 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1179,7 +1179,7 @@ static ssize_t vpe_write(struct file *file, const char __user * buffer,
         size_t ret = count;
         struct vpe *v;
 
-        minor = iminor(file->f_dentry->d_inode);
+        minor = iminor(file->f_path.dentry->d_inode);
         if ((v = get_vpe(minor)) == NULL)
                 return -ENODEV;
 
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c
index 6dd7ae1b7c25..da35d4555491 100644
--- a/arch/mips/lasat/sysctl.c
+++ b/arch/mips/lasat/sysctl.c
@@ -286,11 +286,11 @@ int proc_lasat_eeprom_value(ctl_table *table, int write, struct file *filp,
                 mutex_unlock(&lasat_info_mutex);
                 return r;
         }
-        if (filp && filp->f_dentry)
+        if (filp && filp->f_path.dentry)
         {
-                if (!strcmp(filp->f_dentry->d_name.name, "prid"))
+                if (!strcmp(filp->f_path.dentry->d_name.name, "prid"))
                         lasat_board_info.li_eeprom_info.prid = lasat_board_info.li_prid;
-                if (!strcmp(filp->f_dentry->d_name.name, "debugaccess"))
+                if (!strcmp(filp->f_path.dentry->d_name.name, "debugaccess"))
                         lasat_board_info.li_eeprom_info.debugaccess = lasat_board_info.li_debugaccess;
         }
         lasat_write_eeprom_info();