LINUX24: NEED_IOCTL32 fixup
authorAndrew Deason <adeason@sinenomine.net>
Mon, 28 Jun 2010 15:46:22 +0000 (10:46 -0500)
committerDerrick Brashear <shadow@dementia.org>
Mon, 28 Jun 2010 17:37:17 +0000 (10:37 -0700)
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>

src/afs/LINUX24/osi_ioctl.c

index 35ed967..e2d8972 100644 (file)
@@ -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;