Unionfs: compat_ioctl fixes

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c
index d408369e3f0cff2adabca222e573a92d29378efa..60dce98f5bd52448885f404e1275894f21cac093 100644 (file)
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -743,10 +743,8 @@ static long do_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        if (lower_file->f_op->unlocked_ioctl) {
                err = lower_file->f_op->unlocked_ioctl(lower_file, cmd, arg);
 #ifdef CONFIG_COMPAT
-       } else if (lower_file->f_op->ioctl) {
-               err = lower_file->f_op->compat_ioctl(
-                       lower_file->f_path.dentry->d_inode,
-                       lower_file, cmd, arg);
+       } else if (lower_file->f_op->compat_ioctl) {
+               err = lower_file->f_op->compat_ioctl(lower_file, cmd, arg);
 #endif
        }