On Tue, 2005-03-15 at 08:42 -0800, Roland Dreier wrote:
> Hal> Hi Roland, Just ran across this reminder:
>
> Hal> Should user_mad.c be updated for the following: /* XXX remove
> Hal> once 2.6.11 is released */
>
> Yep, I'd apply that patch for sure.
Make sure this doesn't get lost.
Signed-off-by: Tom Duffy <[EMAIL PROTECTED]>
Index: drivers/infiniband/core/user_mad.c
===================================================================
--- drivers/infiniband/core/user_mad.c (revision 2038)
+++ drivers/infiniband/core/user_mad.c (working copy)
@@ -43,10 +43,6 @@
#include <linux/poll.h>
#include <linux/rwsem.h>
#include <linux/kref.h>
-/* XXX remove once 2.6.11 is released */
-#if !defined(HAVE_COMPAT_IOCTL) || !defined(HAVE_UNLOCKED_IOCTL)
-#include <linux/ioctl32.h>
-#endif
#include <asm/uaccess.h>
#include <asm/semaphore.h>
@@ -462,14 +458,8 @@ out:
return ret;
}
-/* XXX remove once 2.6.11 is released */
-#if !defined(HAVE_COMPAT_IOCTL) || !defined(HAVE_UNLOCKED_IOCTL)
-static int ib_umad_ioctl(struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg)
-#else
-static long ib_umad_ioctl(struct file *filp,
- unsigned int cmd, unsigned long arg)
-#endif
+static long ib_umad_ioctl(struct file *filp, unsigned int cmd,
+ unsigned long arg)
{
switch (cmd) {
case IB_USER_MAD_REGISTER_AGENT:
@@ -525,13 +515,8 @@ static struct file_operations umad_fops
.read = ib_umad_read,
.write = ib_umad_write,
.poll = ib_umad_poll,
-/* XXX remove once 2.6.11 is released */
-#if !defined(HAVE_COMPAT_IOCTL) || !defined(HAVE_UNLOCKED_IOCTL)
- .ioctl = ib_umad_ioctl,
-#else
.unlocked_ioctl = ib_umad_ioctl,
.compat_ioctl = ib_umad_ioctl,
-#endif
.open = ib_umad_open,
.release = ib_umad_close
};
@@ -832,25 +817,8 @@ static int __init ib_umad_init(void)
goto out_class;
}
-/* XXX remove once 2.6.11 is released */
-#if !defined(HAVE_COMPAT_IOCTL) || !defined(HAVE_UNLOCKED_IOCTL)
- /* Our ioctls are 32/64 clean */
- ret = register_ioctl32_conversion(IB_USER_MAD_REGISTER_AGENT, NULL);
- ret |= register_ioctl32_conversion(IB_USER_MAD_UNREGISTER_AGENT, NULL);
- if (ret) {
- printk(KERN_ERR "user_mad: couldn't register ioctl32
conversions\n");
- goto out_client;
- }
-#endif
-
return 0;
-/* XXX remove once 2.6.11 is released */
-#if !defined(HAVE_COMPAT_IOCTL) || !defined(HAVE_UNLOCKED_IOCTL)
-out_client:
- ib_unregister_client(&umad_client);
-#endif
-
out_class:
class_unregister(&umad_class);
@@ -863,11 +831,6 @@ out:
static void __exit ib_umad_cleanup(void)
{
-/* XXX remove once 2.6.11 is released */
-#if !defined(HAVE_COMPAT_IOCTL) || !defined(HAVE_UNLOCKED_IOCTL)
- unregister_ioctl32_conversion(IB_USER_MAD_REGISTER_AGENT);
- unregister_ioctl32_conversion(IB_USER_MAD_UNREGISTER_AGENT);
-#endif
ib_unregister_client(&umad_client);
class_unregister(&umad_class);
unregister_chrdev_region(base_dev, IB_UMAD_MAX_PORTS * 2);
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
