1 files changed, 7 insertions, 7 deletions

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 4b7660b09ac0..ff61772ceedd 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -31,7 +31,7 @@ static long do_ioctl(struct file *filp, unsigned int cmd,
                 goto out;
         } else if (filp->f_op->ioctl) {
                 lock_kernel();
-                error = filp->f_op->ioctl(filp->f_dentry->d_inode,
+                error = filp->f_op->ioctl(filp->f_path.dentry->d_inode,
                                           filp, cmd, arg);
                 unlock_kernel();
         }
@@ -45,7 +45,7 @@ static int file_ioctl(struct file *filp, unsigned int cmd,
 {
         int error;
         int block;
-        struct inode * inode = filp->f_dentry->d_inode;
+        struct inode * inode = filp->f_path.dentry->d_inode;
         int __user *p = (int __user *)arg;
 
         switch (cmd) {
@@ -137,17 +137,17 @@ int vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, unsigned lon
                         break;
 
                 case FIOQSIZE:
-                        if (S_ISDIR(filp->f_dentry->d_inode->i_mode) ||
-                            S_ISREG(filp->f_dentry->d_inode->i_mode) ||
-                            S_ISLNK(filp->f_dentry->d_inode->i_mode)) {
-                                loff_t res = inode_get_bytes(filp->f_dentry->d_inode);
+                        if (S_ISDIR(filp->f_path.dentry->d_inode->i_mode) ||
+                            S_ISREG(filp->f_path.dentry->d_inode->i_mode) ||
+                            S_ISLNK(filp->f_path.dentry->d_inode->i_mode)) {
+                                loff_t res = inode_get_bytes(filp->f_path.dentry->d_inode);
                                 error = copy_to_user((loff_t __user *)arg, &res, sizeof(res)) ? -EFAULT : 0;
                         }
                         else
                                 error = -ENOTTY;
                         break;
                 default:
-                        if (S_ISREG(filp->f_dentry->d_inode->i_mode))
+                        if (S_ISREG(filp->f_path.dentry->d_inode->i_mode))
                                 error = file_ioctl(filp, cmd, arg);
                         else
                                 error = do_ioctl(filp, cmd, arg);