Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f75e00c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[PATCH] switch fs3270 to ->compat_ioctl 



Again easy because all ioctls are compat clean.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bdff071d

arch/s390/kernel/compat_ioctl.c

+0 −7
Original line number Diff line number Diff line
@@ -64,13 +64,6 @@ COMPATIBLE_IOCTL(BIODASDCMFENABLE) 
COMPATIBLE_IOCTL(BIODASDCMFDISABLE)

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)



/* s390 doesn't need handlers here */

drivers/s390/char/fs3270.c

+11 −9
Original line number Diff line number Diff line
@@ -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

 */

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 @@ fs3270_ioctl(struct inode *inode, struct file *filp, 
	if (!fp)

		return -ENODEV;

	rc = 0;

	lock_kernel();

	switch (cmd) {

	case TUBICMD:

		fp->read_command = arg;
@@ -356,6 +356,7 @@ fs3270_ioctl(struct inode *inode, struct file *filp, 
			rc = -EFAULT;

		break;

	}

	unlock_kernel();

	return rc;

}
@@ -494,7 +495,8 @@ static struct file_operations fs3270_fops = { 
	.owner		 = THIS_MODULE,		/* owner */

	.read		 = fs3270_read,		/* read */

	.write		 = fs3270_write,	/* write */

	.ioctl	 = fs3270_ioctl,	/* ioctl */

	.unlocked_ioctl	 = fs3270_ioctl,	/* ioctl */

	.compat_ioctl	 = fs3270_ioctl,	/* ioctl */

	.open	 	= fs3270_open,		/* open */

	.release 	= fs3270_close,		/* release */

};