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

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

[PATCH] ->compat_ioctl for 390 tape_char 



The only own ioctl, TAPE390_DISPLAY, is compat_clean, everything else is
routed through common translation code.

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 51a99058

arch/s390/kernel/compat_ioctl.c

+0 −2
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ COMPATIBLE_IOCTL(BIODASDSATTR) 
COMPATIBLE_IOCTL(BIODASDCMFENABLE)

COMPATIBLE_IOCTL(BIODASDCMFDISABLE)

COMPATIBLE_IOCTL(BIODASDREADALLCMB)



COMPATIBLE_IOCTL(TAPE390_DISPLAY)

};



int ioctl_table_size = ARRAY_SIZE(ioctl_start);

drivers/s390/char/tape_char.c

+20 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ static int tapechar_open(struct inode *,struct file *); 
static int tapechar_release(struct inode *,struct file *);

static int tapechar_ioctl(struct inode *, struct file *, unsigned int,

			  unsigned long);

static long tapechar_compat_ioctl(struct file *, unsigned int,

			  unsigned long);



static struct file_operations tape_fops =

{
@@ -44,6 +46,7 @@ static struct file_operations tape_fops = 
	.read = tapechar_read,

	.write = tapechar_write,

	.ioctl = tapechar_ioctl,

	.compat_ioctl = tapechar_compat_ioctl,

	.open = tapechar_open,

	.release = tapechar_release,

};
@@ -463,6 +466,23 @@ tapechar_ioctl(struct inode *inp, struct file *filp, 
	return device->discipline->ioctl_fn(device, no, data);

}



static long

tapechar_compat_ioctl(struct file *filp, unsigned int no, unsigned long data)

{

	struct tape_device *device = filp->private_data;

	int rval = -ENOIOCTLCMD;



	if (device->discipline->ioctl_fn) {

		lock_kernel();

		rval = device->discipline->ioctl_fn(device, no, data);

		unlock_kernel();

		if (rval == -EINVAL)

			rval = -ENOIOCTLCMD;

	}



	return rval;

}



/*

 * Initialize character device frontend.

 */