mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 15:15:47 +00:00
[PATCH] switch pktcdvd to blkdev_driver_ioctl()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
bbc1cc9784
commit
a0eb62a0a4
1 changed files with 10 additions and 10 deletions
|
@ -2803,6 +2803,14 @@ static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
|
||||||
VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode));
|
VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode));
|
||||||
|
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
|
case CDROMEJECT:
|
||||||
|
/*
|
||||||
|
* The door gets locked when the device is opened, so we
|
||||||
|
* have to unlock it or else the eject command fails.
|
||||||
|
*/
|
||||||
|
if (pd->refcnt == 1)
|
||||||
|
pkt_lock_door(pd, 0);
|
||||||
|
/* fallthru */
|
||||||
/*
|
/*
|
||||||
* forward selected CDROM ioctls to CD-ROM, for UDF
|
* forward selected CDROM ioctls to CD-ROM, for UDF
|
||||||
*/
|
*/
|
||||||
|
@ -2811,16 +2819,8 @@ static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
|
||||||
case CDROM_LAST_WRITTEN:
|
case CDROM_LAST_WRITTEN:
|
||||||
case CDROM_SEND_PACKET:
|
case CDROM_SEND_PACKET:
|
||||||
case SCSI_IOCTL_SEND_COMMAND:
|
case SCSI_IOCTL_SEND_COMMAND:
|
||||||
return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
|
return blkdev_driver_ioctl(pd->bdev->bd_inode, pd->bdev->bd_disk,
|
||||||
|
file, cmd, arg);
|
||||||
case CDROMEJECT:
|
|
||||||
/*
|
|
||||||
* The door gets locked when the device is opened, so we
|
|
||||||
* have to unlock it or else the eject command fails.
|
|
||||||
*/
|
|
||||||
if (pd->refcnt == 1)
|
|
||||||
pkt_lock_door(pd, 0);
|
|
||||||
return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
|
|
||||||
|
|
||||||
default:
|
default:
|
||||||
VPRINTK(DRIVER_NAME": Unknown ioctl for %s (%x)\n", pd->name, cmd);
|
VPRINTK(DRIVER_NAME": Unknown ioctl for %s (%x)\n", pd->name, cmd);
|
||||||
|
|
Loading…
Reference in a new issue