From: Christoph Hellwig Add a compat_ioctl method to the dasd driver so the last entries in arch/s390/kernel/compat_ioctl.c can go away. Unlike the previous attempt this one does not replace the ioctl method with an unlocked_ioctl method so that the ioctl_by_bdev calls in s390 partition code continue to work. Signed-off-by: Christoph Hellwig Cc: Martin Schwidefsky Signed-off-by: Andrew Morton --- arch/s390/kernel/compat_ioctl.c | 21 --------------------- drivers/s390/block/dasd.c | 1 + drivers/s390/block/dasd_int.h | 1 + drivers/s390/block/dasd_ioctl.c | 12 ++++++++++++ 4 files changed, 14 insertions(+), 21 deletions(-) diff -puN arch/s390/kernel/compat_ioctl.c~add-compat_ioctl-to-dasd arch/s390/kernel/compat_ioctl.c --- devel/arch/s390/kernel/compat_ioctl.c~add-compat_ioctl-to-dasd 2005-12-13 14:37:44.000000000 -0800 +++ devel-akpm/arch/s390/kernel/compat_ioctl.c 2005-12-13 14:37:44.000000000 -0800 @@ -42,27 +42,6 @@ struct ioctl_trans ioctl_start[] = { #include #define DECLARES #include "../../../fs/compat_ioctl.c" - -/* s390 only ioctls */ -COMPATIBLE_IOCTL(DASDAPIVER) -COMPATIBLE_IOCTL(BIODASDDISABLE) -COMPATIBLE_IOCTL(BIODASDENABLE) -COMPATIBLE_IOCTL(BIODASDRSRV) -COMPATIBLE_IOCTL(BIODASDRLSE) -COMPATIBLE_IOCTL(BIODASDSLCK) -COMPATIBLE_IOCTL(BIODASDINFO) -COMPATIBLE_IOCTL(BIODASDINFO2) -COMPATIBLE_IOCTL(BIODASDFMT) -COMPATIBLE_IOCTL(BIODASDPRRST) -COMPATIBLE_IOCTL(BIODASDQUIESCE) -COMPATIBLE_IOCTL(BIODASDRESUME) -COMPATIBLE_IOCTL(BIODASDPRRD) -COMPATIBLE_IOCTL(BIODASDPSRD) -COMPATIBLE_IOCTL(BIODASDGATTR) -COMPATIBLE_IOCTL(BIODASDSATTR) -COMPATIBLE_IOCTL(BIODASDCMFENABLE) -COMPATIBLE_IOCTL(BIODASDCMFDISABLE) -COMPATIBLE_IOCTL(BIODASDREADALLCMB) }; int ioctl_table_size = ARRAY_SIZE(ioctl_start); diff -puN drivers/s390/block/dasd.c~add-compat_ioctl-to-dasd drivers/s390/block/dasd.c --- devel/drivers/s390/block/dasd.c~add-compat_ioctl-to-dasd 2005-12-13 14:37:44.000000000 -0800 +++ devel-akpm/drivers/s390/block/dasd.c 2005-12-13 14:37:44.000000000 -0800 @@ -1751,6 +1751,7 @@ dasd_device_operations = { .open = dasd_open, .release = dasd_release, .ioctl = dasd_ioctl, + .compat_ioctl = dasd_compat_ioctl, .getgeo = dasd_getgeo, }; diff -puN drivers/s390/block/dasd_int.h~add-compat_ioctl-to-dasd drivers/s390/block/dasd_int.h --- devel/drivers/s390/block/dasd_int.h~add-compat_ioctl-to-dasd 2005-12-13 14:37:44.000000000 -0800 +++ devel-akpm/drivers/s390/block/dasd_int.h 2005-12-13 14:37:44.000000000 -0800 @@ -527,6 +527,7 @@ void dasd_ioctl_exit(void); int dasd_ioctl_no_register(struct module *, int, dasd_ioctl_fn_t); int dasd_ioctl_no_unregister(struct module *, int, dasd_ioctl_fn_t); int dasd_ioctl(struct inode *, struct file *, unsigned int, unsigned long); +long dasd_compat_ioctl(struct file *, unsigned int, unsigned long); /* externals in dasd_proc.c */ int dasd_proc_init(void); diff -puN drivers/s390/block/dasd_ioctl.c~add-compat_ioctl-to-dasd drivers/s390/block/dasd_ioctl.c --- devel/drivers/s390/block/dasd_ioctl.c~add-compat_ioctl-to-dasd 2005-12-13 14:37:44.000000000 -0800 +++ devel-akpm/drivers/s390/block/dasd_ioctl.c 2005-12-13 14:37:44.000000000 -0800 @@ -118,6 +118,18 @@ dasd_ioctl(struct inode *inp, struct fil return -EINVAL; } +long +dasd_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + int rval; + + lock_kernel(); + rval = dasd_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); + unlock_kernel(); + + return rval; +} + static int dasd_ioctl_api_version(struct block_device *bdev, int no, long args) { _