[PATCH 21/25] reiserfs: remove ioctl conversion code

Arnd Bergmann
2005-11-05T16:34:51Z

[-- Attachment #1: reiserfs_ioctl.diff --]
[-- Type: text/plain, Size: 1282 bytes --]

An earlier patch in this series already adds a handler for
this in reiserfs itself, so the code in compat_ioctl.c
is no longer needed.

CC: reiserfs-dev@namesys.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Index: linux-2.6.14-rc/fs/compat_ioctl.c
===================================================================
--- linux-2.6.14-rc.orig/fs/compat_ioctl.c 2005-11-04 01:19:31.000000000 +0100
+++ linux-2.6.14-rc/fs/compat_ioctl.c 2005-11-04 01:20:04.000000000 +0100
@@ -356,16 +356,6 @@
#define HIDPGETCONNLIST _IOR('H', 210, int)
#define HIDPGETCONNINFO _IOR('H', 211, int)

-#define REISERFS_IOC_UNPACK32 _IOW(0xCD,1,int)
-
-static int reiserfs_ioctl32(unsigned fd, unsigned cmd, unsigned long ptr)
-{
- if (cmd == REISERFS_IOC_UNPACK32)
- cmd = REISERFS_IOC_UNPACK;
-
- return sys_ioctl(fd,cmd,ptr);
-}
-
struct serial_struct32 {
compat_int_t type;
compat_int_t line;
@@ -435,7 +425,6 @@
HANDLE_IOCTL(MTIOCPOS32, mt_ioctl_trans)
HANDLE_IOCTL(CDROMREADAUDIO, cdrom_ioctl_trans)
HANDLE_IOCTL(CDROM_SEND_PACKET, cdrom_ioctl_trans)
-HANDLE_IOCTL(REISERFS_IOC_UNPACK32, reiserfs_ioctl32)
/* Serial */
HANDLE_IOCTL(TIOCGSERIAL, serial_struct_ioctl)
HANDLE_IOCTL(TIOCSSERIAL, serial_struct_ioctl)

--