Skip to contentSkip to conversation

{,un}register_ioctl32_conversion should have been removed last month

PATCH In review Adrian Bunk 5 participants 9 messages May 2, 2005 – May 3, 2005

Subsystems (2)
Documentation VFS
lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 {,un}register_ioctl32_conversion should have been removed last month

This removal should have happened last month.

Signed-off-by Adrian Bunk <[email protected]>

---

 Documentation/feature-removal-schedule.txt |    8 -
 fs/compat.c                                |   90 ---------------------
 include/linux/ioctl32.h                    |   22 -----
 3 files changed, 120 deletions(-)
Documentation/feature-removal-schedule.txt renamed from Documentation/feature-removal-schedule.txt.old +0 -8
@@ -43,14 +43,6 @@
 
 ---------------------------
 
-What:	register_ioctl32_conversion() / unregister_ioctl32_conversion()
-When:	April 2005
-Why:	Replaced by ->compat_ioctl in file_operations and other method
-	vecors.
-Who:	Andi Kleen <[email protected]>, Christoph Hellwig <[email protected]>
-
----------------------------
-
 What:	RCU API moves to EXPORT_SYMBOL_GPL
 When:	April 2006
 Files:	include/linux/rcupdate.h, kernel/rcupdate.c
include/linux/ioctl32.h renamed from include/linux/ioctl32.h.old +0 -22
@@ -14,26 +14,4 @@
 	struct ioctl_trans *next;
 };
 
-/* 
- * Register an 32bit ioctl translation handler for ioctl cmd.
- *
- * handler == NULL: use 64bit ioctl handler.
- * arguments to handler:  fd: file descriptor
- *                        cmd: ioctl command.
- *                        arg: ioctl argument
- *                        struct file *file: file descriptor pointer.
- */ 
-
-#ifdef CONFIG_COMPAT
-extern int __deprecated register_ioctl32_conversion(unsigned int cmd,
-				ioctl_trans_handler_t handler);
-extern int __deprecated unregister_ioctl32_conversion(unsigned int cmd);
-
-#else
-
-#define register_ioctl32_conversion(cmd, handler)	({ 0; })
-#define unregister_ioctl32_conversion(cmd)		({ 0; })
-
-#endif
-
 #endif
fs/compat.c renamed from fs/compat.c.old +0 -90

96 lines not on this page · raw message

#1 lore raw
Quoted 1 line · Adrian Bunk

This removal should have happened last month.

Thanks. I believe I2O and s390 are still using it though. The I2O patch is pending somewhere and s390 will hopefully catch up.

-Andi

Quoted 8 lines
Signed-off-by Adrian Bunk <[email protected]>

---

 Documentation/feature-removal-schedule.txt |    8 -
 fs/compat.c                                |   90 ---------------------
 include/linux/ioctl32.h                    |   22 -----
#2 lore raw
Quoted 5 lines · Andi Kleen
Quoted 1 line · Adrian Bunk

This removal should have happened last month.

Thanks. I believe I2O and s390 are still using it though. The I2O patch is pending somewhere and s390 will hopefully catch up.

both i2o and s390 have been converted away from it in mainline.

author
#3 lore raw
In reply to Andi Kleen
Quoted 5 lines · Andi Kleen
Quoted 1 line · Adrian Bunk

This removal should have happened last month.

Thanks. I believe I2O and s390 are still using it though. The I2O patch is pending somewhere and s390 will hopefully catch up.

There are no users in 2.6.12-rc3-mm2.

Quoted 1 line

-Andi

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#4 lore raw
Quoted 8 lines · Adrian Bunk
Quoted 5 lines · Andi Kleen
Quoted 1 line · Adrian Bunk

This removal should have happened last month.

Thanks. I believe I2O and s390 are still using it though. The I2O patch is pending somewhere and s390 will hopefully catch up.

There are no users in 2.6.12-rc3-mm2.

Great. It can go then.

BTW with that the BKL in compat_ioctl can be removed too - it is useless now.

-Andi

#5 lore raw
In reply to Adrian Bunk
Quoted 2 lines · Adrian Bunk

This removal should have happened last month.

drivers/usb/misc/sisusbvga/sisusb.c will use these functions if someone defines SISUSB_OLD_CONFIG_COMPAT, so we need to agree to zap that code before I can merge this upstream.

author
#6 lore raw
Quoted 7 lines · Andrew Morton
Quoted 2 lines · Adrian Bunk

This removal should have happened last month.

drivers/usb/misc/sisusbvga/sisusb.c will use these functions if someone defines SISUSB_OLD_CONFIG_COMPAT, so we need to agree to zap that code before I can merge this upstream.

That's not a problem.

Quoting drivers/usb/misc/sisusbvga/sisusb.h:

#ifdef CONFIG_COMPAT
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10)
#include <linux/ioctl32.h>
#define SISUSB_OLD_CONFIG_COMPAT
#else
#define SISUSB_NEW_CONFIG_COMPAT
#endif
#endif

I decided not to drop the SISUSB_OLD_CONFIG_COMPAT code in my patch because it seems Thomas is sharing this code between different kernel versions, and a removal might make his life harder for no big win.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#7 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 9 lines · Adrian Bunk
Quoted 7 lines · Andrew Morton
Quoted 1 line · Adrian Bunk

This removal should have happened last month.

drivers/usb/misc/sisusbvga/sisusb.c will use these functions if someone defines SISUSB_OLD_CONFIG_COMPAT, so we need to agree to zap that code before I can merge this upstream.

Why on earth should anyone #define something with "SISUSB" in the beginning, on a level that might be available in a usb driver?

Quoted 16 lines

That's not a problem.

Quoting drivers/usb/misc/sisusbvga/sisusb.h:

#ifdef CONFIG_COMPAT
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10)
#include <linux/ioctl32.h>
#define SISUSB_OLD_CONFIG_COMPAT
#else
#define SISUSB_NEW_CONFIG_COMPAT
#endif
#endif

Quoted 3 lines

I decided not to drop the SISUSB_OLD_CONFIG_COMPAT code in my patch because it seems Thomas is sharing this code between different kernel versions, and a removal might make his life harder for no big win.

Exactly. Thanks, Adrian.

Thomas

- --
Thomas Winischhofer
Vienna/Austria
thomas AT winischhofer DOT net *** http://www.winischhofer.net
twini AT xfree86 DOT org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCdyh+zydIRAktyUcRAgTLAKDJ7woebRDkqRS70aImI5c0y+fiyQCgyNqE 8haWeqvcbbbCjYn607Xh51E=
=ZaoZ
-----END PGP SIGNATURE-----

#8 lore raw
In reply to Andrew Morton
Quoted 7 lines · Andrew Morton
Quoted 2 lines · Adrian Bunk

This removal should have happened last month.

drivers/usb/misc/sisusbvga/sisusb.c will use these functions if someone defines SISUSB_OLD_CONFIG_COMPAT, so we need to agree to zap that code before I can merge this upstream.

I had a patch to fix that one. I think I sent it to the maintainer, perhaps he ignored it. I will dig it up again.

-Andi