Commit e9ee7fea authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: cdrom: Remove the call to scsi_cmd_blk_ioctl() from cdrom_ioctl() 

Only the sr driver can handle SCSI passthrough requests, so move the call
to scsi_cmd_blk_ioctl() there.

Link: https://lore.kernel.org/r/20210724072033.1284840-9-hch@lst.de


Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent dba7688f

drivers/block/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ config N64CART 


config CDROM

	tristate

	select BLK_SCSI_REQUEST



config GDROM

	tristate "SEGA Dreamcast GD-ROM drive"

drivers/block/paride/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ config PARIDE_PCD 
	tristate "Parallel port ATAPI CD-ROMs"

	depends on PARIDE

	select CDROM

	select BLK_SCSI_REQUEST # only for the generic cdrom code

	help

	  This option enables the high-level driver for ATAPI CD-ROM devices

	  connected through a parallel port. If you chose to build PARIDE

drivers/cdrom/cdrom.c

+0 −7
Original line number Diff line number Diff line
@@ -3357,13 +3357,6 @@ int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev, 
	void __user *argp = (void __user *)arg;

	int ret;



	/*

	 * Try the generic SCSI command ioctl's first.

	 */

	ret = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);

	if (ret != -ENOTTY)

		return ret;



	switch (cmd) {

	case CDROMMULTISESSION:

		return cdrom_ioctl_multisession(cdi, argp);

drivers/scsi/sr.c

+3 −0
Original line number Diff line number Diff line
@@ -579,6 +579,9 @@ static int sr_block_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, 
	case SCSI_IOCTL_GET_BUS_NUMBER:

		break;

	default:

		ret = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);

		if (ret != -ENOTTY)

			goto put;

		ret = cdrom_ioctl(&cd->cdi, bdev, mode, cmd, arg);

		if (ret != -ENOSYS)

			goto put;