diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-11-28 17:55:17 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-01-03 11:42:52 +0300 |
| commit | 64cbfa96551a1511b9babef06afa06a1c6c4e8f5 (patch) | |
| tree | ceecacbdd6b77534fd4cba5832727e397dab96b3 /drivers/scsi/sr.c | |
| parent | 77b9040195dea3fcddf19e136c9e99a501351778 (diff) | |
| download | linux-64cbfa96551a1511b9babef06afa06a1c6c4e8f5.tar.xz | |
compat_ioctl: move cdrom commands into cdrom.c
There is no need for the special cases for the cdrom ioctls any more now,
so make sure that each cdrom driver has a .compat_ioctl() callback and
calls cdrom_compat_ioctl() directly there.
Reviewed-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/scsi/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index f1e7aab00ce3..0fbb8fe6e521 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -628,12 +628,8 @@ static int sr_block_compat_ioctl(struct block_device *bdev, fmode_t mode, unsign goto put; } - /* - * CDROM ioctls are handled in the block layer, but - * do the scsi blk ioctls here. - */ - ret = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp); - if (ret != -ENOTTY) + ret = cdrom_ioctl(&cd->cdi, bdev, mode, cmd, (unsigned long)argp); + if (ret != -ENOSYS) goto put; ret = scsi_compat_ioctl(sdev, cmd, argp); |