Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[karo-tx-linux.git] / fs / compat_ioctl.c

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index e2f57a0070295f73af43d0c3e1ed63343b7ef2fc..3ced75f765ca069d12e6da7b1e4c38aa015f5279 100644 (file)
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -1582,7 +1582,7 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
        case FIBMAP:
        case FIGETBSZ:
        case FIONREAD:
-               if (S_ISREG(f.file->f_path.dentry->d_inode->i_mode))
+               if (S_ISREG(file_inode(f.file)->i_mode))
                        break;
                /*FALL THROUGH*/