mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
[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: 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:
parent
51a990588a
commit
f042e0f80b
2 changed files with 20 additions and 2 deletions
|
@ -63,8 +63,6 @@ COMPATIBLE_IOCTL(BIODASDSATTR)
|
||||||
COMPATIBLE_IOCTL(BIODASDCMFENABLE)
|
COMPATIBLE_IOCTL(BIODASDCMFENABLE)
|
||||||
COMPATIBLE_IOCTL(BIODASDCMFDISABLE)
|
COMPATIBLE_IOCTL(BIODASDCMFDISABLE)
|
||||||
COMPATIBLE_IOCTL(BIODASDREADALLCMB)
|
COMPATIBLE_IOCTL(BIODASDREADALLCMB)
|
||||||
|
|
||||||
COMPATIBLE_IOCTL(TAPE390_DISPLAY)
|
|
||||||
};
|
};
|
||||||
|
|
||||||
int ioctl_table_size = ARRAY_SIZE(ioctl_start);
|
int ioctl_table_size = ARRAY_SIZE(ioctl_start);
|
||||||
|
|
|
@ -37,6 +37,8 @@ static int tapechar_open(struct inode *,struct file *);
|
||||||
static int tapechar_release(struct inode *,struct file *);
|
static int tapechar_release(struct inode *,struct file *);
|
||||||
static int tapechar_ioctl(struct inode *, struct file *, unsigned int,
|
static int tapechar_ioctl(struct inode *, struct file *, unsigned int,
|
||||||
unsigned long);
|
unsigned long);
|
||||||
|
static long tapechar_compat_ioctl(struct file *, unsigned int,
|
||||||
|
unsigned long);
|
||||||
|
|
||||||
static struct file_operations tape_fops =
|
static struct file_operations tape_fops =
|
||||||
{
|
{
|
||||||
|
@ -44,6 +46,7 @@ static struct file_operations tape_fops =
|
||||||
.read = tapechar_read,
|
.read = tapechar_read,
|
||||||
.write = tapechar_write,
|
.write = tapechar_write,
|
||||||
.ioctl = tapechar_ioctl,
|
.ioctl = tapechar_ioctl,
|
||||||
|
.compat_ioctl = tapechar_compat_ioctl,
|
||||||
.open = tapechar_open,
|
.open = tapechar_open,
|
||||||
.release = tapechar_release,
|
.release = tapechar_release,
|
||||||
};
|
};
|
||||||
|
@ -463,6 +466,23 @@ tapechar_ioctl(struct inode *inp, struct file *filp,
|
||||||
return device->discipline->ioctl_fn(device, no, data);
|
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.
|
* Initialize character device frontend.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue