1 files changed, 0 insertions, 83 deletions
diff --git a/0001-compat_ioctl-cdrom-Replace-.ioctl-with-.compat_ioctl.patch b/0001-compat_ioctl-cdrom-Replace-.ioctl-with-.compat_ioctl.patch
deleted file mode 100644
index be10f81af..000000000
--- a/0001-compat_ioctl-cdrom-Replace-.ioctl-with-.compat_ioctl.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From cef57541cdc079165e9af419ccacd36dce863d3a Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Wed, 19 Feb 2020 17:50:07 +0100
-Subject: [PATCH] compat_ioctl, cdrom: Replace .ioctl with .compat_ioctl in
- four appropriate places
-
-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.24.1
-