leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Arnd Bergmann inadvertently typoed these in d320a9551e and 64cbfa96551a;
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: c103d6ee69 ("compat_ioctl: ide: floppy: add handler")
Fixes: 64cbfa9655 ("compat_ioctl: move cdrom commands into cdrom.c")
Fixes: d320a9551e ("compat_ioctl: scsi: move ioctl handling into drivers")
Bisected-by: Chris Murphy <bugzilla@colorremedies.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Adam Williamson <awilliam@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Adam Williamson 2020-02-19 17:50:07 +01:00 committed by Martin K. Petersen
parent a3fd4bfe85
commit 03264ddde2
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/paride/pcd.c
View File

@ -276,7 +276,7 @@ static const struct block_device_operations pcd_bdops = {
.release = pcd_block_release, .release = pcd_block_release,
.ioctl = pcd_block_ioctl, .ioctl = pcd_block_ioctl,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.ioctl = blkdev_compat_ptr_ioctl, .compat_ioctl = blkdev_compat_ptr_ioctl,
#endif #endif
.check_events = pcd_block_check_events, .check_events = pcd_block_check_events,
}; };

2
drivers/cdrom/gdrom.c
View File

@ -519,7 +519,7 @@ static const struct block_device_operations gdrom_bdops = {
.check_events = gdrom_bdops_check_events, .check_events = gdrom_bdops_check_events,
.ioctl = gdrom_bdops_ioctl, .ioctl = gdrom_bdops_ioctl,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.ioctl = blkdev_compat_ptr_ioctl, .compat_ioctl = blkdev_compat_ptr_ioctl,
#endif #endif
}; };

2
drivers/ide/ide-gd.c
View File

@ -361,7 +361,7 @@ static const struct block_device_operations ide_gd_ops = {
.release = ide_gd_release, .release = ide_gd_release,
.ioctl = ide_gd_ioctl, .ioctl = ide_gd_ioctl,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.ioctl = ide_gd_compat_ioctl, .compat_ioctl = ide_gd_compat_ioctl,
#endif #endif
.getgeo = ide_gd_getgeo, .getgeo = ide_gd_getgeo,
.check_events = ide_gd_check_events, .check_events = ide_gd_check_events,

2
drivers/scsi/sr.c
View File

@ -688,7 +688,7 @@ static const struct block_device_operations sr_bdops =
.release = sr_block_release, .release = sr_block_release,
.ioctl = sr_block_ioctl, .ioctl = sr_block_ioctl,
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
.ioctl = sr_block_compat_ioctl, .compat_ioctl = sr_block_compat_ioctl,
#endif #endif
.check_events = sr_block_check_events, .check_events = sr_block_check_events,
.revalidate_disk = sr_block_revalidate_disk, .revalidate_disk = sr_block_revalidate_disk,