Commit 03264ddd authored by Adam Williamson's avatar Adam Williamson Committed by Martin K. Petersen
Browse files

scsi: compat_ioctl: cdrom: Replace .ioctl with .compat_ioctl in four appropriate places 

Arnd Bergmann inadvertently typoed these in d320a955 and 64cbfa96;
they seem to be the cause of
https://bugzilla.redhat.com/show_bug.cgi?id=1801353 , invalid SCSI commands
when udev tries to query a DVD drive.

[arnd] Found another instance of the same bug, also introduced in my
compat_ioctl series.

Link: https://bugzilla.redhat.com/show_bug.cgi?id=1801353
Link: https://lore.kernel.org/r/20200219165139.3467320-1-arnd@arndb.de


Fixes: c103d6ee ("compat_ioctl: ide: floppy: add handler")
Fixes: 64cbfa96 ("compat_ioctl: move cdrom commands into cdrom.c")
Fixes: d320a955 ("compat_ioctl: scsi: move ioctl handling into drivers")
Bisected-by: default avatarChris Murphy <bugzilla@colorremedies.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAdam Williamson <awilliam@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a3fd4bfe

drivers/block/paride/pcd.c

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static const struct block_device_operations pcd_bdops = { 
	.release	= pcd_block_release,

	.ioctl		= pcd_block_ioctl,

#ifdef CONFIG_COMPAT

	.ioctl		= blkdev_compat_ptr_ioctl,

	.compat_ioctl	= blkdev_compat_ptr_ioctl,

#endif

	.check_events	= pcd_block_check_events,

};

drivers/cdrom/gdrom.c

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ static const struct block_device_operations gdrom_bdops = { 
	.check_events		= gdrom_bdops_check_events,

	.ioctl			= gdrom_bdops_ioctl,

#ifdef CONFIG_COMPAT

	.ioctl			= blkdev_compat_ptr_ioctl,

	.compat_ioctl		= blkdev_compat_ptr_ioctl,

#endif

};

drivers/ide/ide-gd.c

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static const struct block_device_operations ide_gd_ops = { 
	.release		= ide_gd_release,

	.ioctl			= ide_gd_ioctl,

#ifdef CONFIG_COMPAT

	.ioctl			= ide_gd_compat_ioctl,

	.compat_ioctl		= ide_gd_compat_ioctl,

#endif

	.getgeo			= ide_gd_getgeo,

	.check_events		= ide_gd_check_events,

drivers/scsi/sr.c

+1 −1
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ static const struct block_device_operations sr_bdops = 
	.release	= sr_block_release,

	.ioctl		= sr_block_ioctl,

#ifdef CONFIG_COMPAT

	.ioctl		= sr_block_compat_ioctl,

	.compat_ioctl	= sr_block_compat_ioctl,

#endif

	.check_events	= sr_block_check_events,

	.revalidate_disk = sr_block_revalidate_disk,

CRA Git | Maintained and supported by SUSTech CRA and CCSE