leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] switch fs3270 to ->compat_ioctl

Browse Source 
Again easy because all ioctls are compat clean.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Christoph Hellwig 2006-01-09 20:52:04 -08:00 committed by Linus Torvalds
parent bdff071dbf
commit 0f75e00c9a
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/s390/kernel/compat_ioctl.c
View File

@ -64,13 +64,6 @@ COMPATIBLE_IOCTL(BIODASDCMFENABLE)
COMPATIBLE_IOCTL(BIODASDCMFDISABLE) COMPATIBLE_IOCTL(BIODASDCMFDISABLE)
COMPATIBLE_IOCTL(BIODASDREADALLCMB) COMPATIBLE_IOCTL(BIODASDREADALLCMB)
COMPATIBLE_IOCTL(TUBICMD)
COMPATIBLE_IOCTL(TUBOCMD)
COMPATIBLE_IOCTL(TUBGETI)
COMPATIBLE_IOCTL(TUBGETO)
COMPATIBLE_IOCTL(TUBSETMOD)
COMPATIBLE_IOCTL(TUBGETMOD)
COMPATIBLE_IOCTL(TAPE390_DISPLAY) COMPATIBLE_IOCTL(TAPE390_DISPLAY)
/* s390 doesn't need handlers here */ /* s390 doesn't need handlers here */

20
drivers/s390/char/fs3270.c
View File

@ -319,9 +319,8 @@ fs3270_write(struct file *filp, const char *data, size_t count, loff_t *off)
/* /*
* process ioctl commands for the tube driver * process ioctl commands for the tube driver
*/ */
static int static long
fs3270_ioctl(struct inode *inode, struct file *filp, fs3270_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
unsigned int cmd, unsigned long arg)
{ {
struct fs3270 *fp; struct fs3270 *fp;
struct raw3270_iocb iocb; struct raw3270_iocb iocb;
@ -331,6 +330,7 @@ fs3270_ioctl(struct inode *inode, struct file *filp,
if (!fp) if (!fp)
return -ENODEV; return -ENODEV;
rc = 0; rc = 0;
lock_kernel();
switch (cmd) { switch (cmd) {
case TUBICMD: case TUBICMD:
fp->read_command = arg; fp->read_command = arg;
@ -356,6 +356,7 @@ fs3270_ioctl(struct inode *inode, struct file *filp,
rc = -EFAULT; rc = -EFAULT;
break; break;
} }
unlock_kernel();
return rc; return rc;
} }
@ -491,12 +492,13 @@ fs3270_close(struct inode *inode, struct file *filp)
} }
static struct file_operations fs3270_fops = { static struct file_operations fs3270_fops = {
.owner = THIS_MODULE, /* owner */ .owner = THIS_MODULE, /* owner */
.read = fs3270_read, /* read */ .read = fs3270_read, /* read */
.write = fs3270_write, /* write */ .write = fs3270_write, /* write */
.ioctl = fs3270_ioctl, /* ioctl */ .unlocked_ioctl = fs3270_ioctl, /* ioctl */
.open = fs3270_open, /* open */ .compat_ioctl = fs3270_ioctl, /* ioctl */
.release = fs3270_close, /* release */ .open = fs3270_open, /* open */
.release = fs3270_close, /* release */
}; };
/* /*