From: Andrew Deason <adeason@sinenomine.net>
Date: Mon, 28 Jun 2010 15:46:22 +0000 (-0500)
Subject: LINUX24: NEED_IOCTL32 fixup
X-Git-Tag: openafs-devel-1_5_75~54
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=cdf8e7de1658aaafe2958c28b7e1fd9bf92f4499;p=packages%2Fo%2Fopenafs.git

LINUX24: NEED_IOCTL32 fixup

The NEED_IOCTL32 symbol needs to protect the entire if block, not just
the conditionals.

Change-Id: Ie33860b1d5677cec19ed19aa1ccc1ce0a26824ff
Reviewed-on: http://gerrit.openafs.org/2270
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/afs/LINUX24/osi_ioctl.c b/src/afs/LINUX24/osi_ioctl.c
index 35ed96759..e2d897277 100644
--- a/src/afs/LINUX24/osi_ioctl.c
+++ b/src/afs/LINUX24/osi_ioctl.c
@@ -65,7 +65,6 @@ afs_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 #else
 #error Not done for this linux type
 #endif 
-#endif /* NEED_IOCTL32 */
     {
 	if (copy_from_user(&sysargs32, (void *)arg,
 			   sizeof(struct afsprocdata32)))
@@ -76,7 +75,9 @@ afs_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 			   (unsigned long)sysargs32.param2,
 			   (unsigned long)sysargs32.param3,
 			   (unsigned long)sysargs32.param4);
-    } else {
+    } else
+#endif /* NEED_IOCTL32 */
+    {
 	if (copy_from_user(&sysargs, (void *)arg, sizeof(struct afsprocdata)))
 	    return -EFAULT;