switch fs3270 to ->compat_ioctl
PATCH 2/4 switch fs3270 to ->compat_ioctl
again easy because all ioctls are compat clean.
arch/s390/kernel/compat_ioctl.c +0 -7
@@ -44,13 +44,6 @@#include "../../../fs/compat_ioctl.c" /* s390 only ioctls */ -COMPATIBLE_IOCTL(TUBICMD) -COMPATIBLE_IOCTL(TUBOCMD) -COMPATIBLE_IOCTL(TUBGETI) -COMPATIBLE_IOCTL(TUBGETO) -COMPATIBLE_IOCTL(TUBSETMOD) -COMPATIBLE_IOCTL(TUBGETMOD) -COMPATIBLE_IOCTL (TAPE390_DISPLAY )/* s390 doesn't need handlers here */
drivers/s390/char/fs3270.c +11 -9
@@ -319,9 +319,8 @@/* * process ioctl commands for the tube driver */ -static int -fs3270_ioctl (struct inode *inode,struct file *filp, -unsigned int cmd,unsigned long arg) +static long +fs3270_ioctl (struct file *filp,unsigned int cmd,unsigned long arg) {struct fs3270 *fp;struct raw3270_iocb iocb;
@@ -331,6 +330,7 @@if (!fp)return -ENODEV ; rc =0 ; +lock_kernel ();switch (cmd) {case TUBICMD : fp->read_command = arg;
@@ -356,6 +356,7 @@ rc = -EFAULT ;break ; } +unlock_kernel ();return rc; }
@@ -491,12 +492,13 @@ }static struct file_operations fs3270_fops = { - .owner =THIS_MODULE ,/* owner */ - .read = fs3270_read,/* read */ - .write = fs3270_write,/* write */ - .ioctl = fs3270_ioctl,/* ioctl */ - .open = fs3270_open,/* open */ - .release = fs3270_close,/* release */ + .owner =THIS_MODULE ,/* owner */ + .read = fs3270_read,/* read */ + .write = fs3270_write,/* write */ + .unlocked_ioctl = fs3270_ioctl,/* ioctl */ + .compat_ioctl = fs3270_ioctl,/* ioctl */ + .open = fs3270_open,/* open */ + .release = fs3270_close,/* release */ };/*