* [PATCH] compat_ioctl, cdrom: Replace .ioctl with .compat_ioctl in four appropriate places
@ 2020-02-19 16:50 Arnd Bergmann
2020-02-24 20:07 ` Martin K. Petersen
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2020-02-19 16:50 UTC (permalink / raw)
To: Jens Axboe, James E.J. Bottomley, Martin K. Petersen
Cc: Adam Williamson, Chris Murphy, Arnd Bergmann, Ben Hutchings,
Stefan Hajnoczi, Tim Waugh, David S. Miller, linux-block,
linux-kernel, linux-ide, linux-scsi
From: Adam Williamson <awilliam@redhat.com>
Arnd Bergmann inadvertently typoed these in d320a9551e394 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.
Fixes: d320a9551e39 ("compat_ioctl: scsi: move ioctl handling into drivers")
Fixes: 64cbfa96551a ("compat_ioctl: move cdrom commands into cdrom.c")
Fixes: c103d6ee69f9 ("compat_ioctl: ide: floppy: add handler")
Link: https://bugzilla.redhat.com/show_bug.cgi?id=1801353
Bisected-by: Chris Murphy <bugzilla@colorremedies.com>
Signed-off-by: Adam Williamson <awilliam@redhat.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/block/paride/pcd.c | 2 +-
drivers/cdrom/gdrom.c | 2 +-
drivers/ide/ide-gd.c | 2 +-
drivers/scsi/sr.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 117cfc8cd05a..cda5cf917e9a 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -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,
};
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 886b2638c730..c51292c2a131 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -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
};
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index 1bb99b556393..05c26986637b 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -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,
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 0fbb8fe6e521..e4240e4ae8bb 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -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,
--
2.25.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] compat_ioctl, cdrom: Replace .ioctl with .compat_ioctl in four appropriate places
2020-02-19 16:50 [PATCH] compat_ioctl, cdrom: Replace .ioctl with .compat_ioctl in four appropriate places Arnd Bergmann
@ 2020-02-24 20:07 ` Martin K. Petersen
2020-02-24 20:18 ` Jens Axboe
0 siblings, 1 reply; 3+ messages in thread
From: Martin K. Petersen @ 2020-02-24 20:07 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Jens Axboe, James E.J. Bottomley, Martin K. Petersen,
Adam Williamson, Chris Murphy, Ben Hutchings, Stefan Hajnoczi,
Tim Waugh, David S. Miller, linux-block, linux-kernel, linux-ide,
linux-scsi
Arnd,
> Arnd Bergmann inadvertently typoed these in d320a9551e394 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.
Applied to 5.6/scsi-fixes. Thanks!
Jens, I hope that's OK? I keep getting mail about this bug.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] compat_ioctl, cdrom: Replace .ioctl with .compat_ioctl in four appropriate places
2020-02-24 20:07 ` Martin K. Petersen
@ 2020-02-24 20:18 ` Jens Axboe
0 siblings, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2020-02-24 20:18 UTC (permalink / raw)
To: Martin K. Petersen, Arnd Bergmann
Cc: James E.J. Bottomley, Adam Williamson, Chris Murphy,
Ben Hutchings, Stefan Hajnoczi, Tim Waugh, David S. Miller,
linux-block, linux-kernel, linux-ide, linux-scsi
On 2/24/20 1:07 PM, Martin K. Petersen wrote:
>
> Arnd,
>
>> Arnd Bergmann inadvertently typoed these in d320a9551e394 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.
>
> Applied to 5.6/scsi-fixes. Thanks!
>
> Jens, I hope that's OK? I keep getting mail about this bug.
Yeah that's fine, thanks for picking this up.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-24 20:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-19 16:50 [PATCH] compat_ioctl, cdrom: Replace .ioctl with .compat_ioctl in four appropriate places Arnd Bergmann
2020-02-24 20:07 ` Martin K. Petersen
2020-02-24 20:18 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).