Merge remote-tracking branch 'regulator/fix/palmas' into tmp

[~andy/linux] / fs / ext2 / ioctl.c

diff --git a/fs/ext2/ioctl.c b/fs/ext2/ioctl.c
index 2de655f5d625365a3aed996d00c0a73d4052559d..5d46c09863f09408258696171dfbec2b72eab994 100644 (file)
--- a/fs/ext2/ioctl.c
+++ b/fs/ext2/ioctl.c
@@ -19,7 +19,7 @@
 
 long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
-       struct inode *inode = filp->f_dentry->d_inode;
+       struct inode *inode = file_inode(filp);
        struct ext2_inode_info *ei = EXT2_I(inode);
        unsigned int flags;
        unsigned short rsv_window_size;