From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Wed, 4 May 2011 05:30:57 +0000 (-0400)
Subject: Unionfs: compat_ioctl fixes
X-Git-Tag: unionfs-2.5.9.2~2
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=fc858f4f3a1d4c93b25c5bf55ad0df755e4059d5;p=unionfs-2.6.38.y.git

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 9f63b1c7b11..0a271f44da2 100644
--- a/fs/unionfs/commonfops.c
+++ b/fs/unionfs/commonfops.c
@@ -742,10 +742,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
 	}