drop floppy patches from 5.14 and 5.15 queues

diff --git a/queue-5.14/floppy-fix-add_disk-assumption-on-exit-due-to-new-de.patch b/queue-5.14/floppy-fix-add_disk-assumption-on-exit-due-to-new-de.patch
deleted file mode 100644 (file)
index ea168c7..0000000
--- a/queue-5.14/floppy-fix-add_disk-assumption-on-exit-due-to-new-de.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From d42f61d25d253c5de5d6d3941bae5cfdb24c169f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 Sep 2021 15:02:50 -0700
-Subject: floppy: fix add_disk() assumption on exit due to new developments
-
-From: Luis Chamberlain <mcgrof@kernel.org>
-
-[ Upstream commit 2598a2bb357d64baaa94368133ddbc900b9eb246 ]
-
-After the patch titled "floppy: use blk_mq_alloc_disk and
-blk_cleanup_disk" the floppy driver was modified to allocate
-the blk_mq_alloc_disk() which allocates the disk with the
-queue. This is further clarified later with the patch titled
-"block: remove alloc_disk and alloc_disk_node". This clarifies
-that:
-
-   Most drivers should use and have been converted to use
-   blk_alloc_disk and blk_mq_alloc_disk.  Only the scsi
-   ULPs and dasd still allocate a disk separately from the
-   request_queue so don't bother with convenience macros for
-   something that should not see significant new users and
-   remove these wrappers.
-
-And then we have the patch titled, "block: hold a request_queue
-reference for the lifetime of struct gendisk" which ensures
-that a queue is *always* present for sure during the entire
-lifetime of a disk.
-
-In the floppy driver's case then the disk always comes with the
-queue. So even if even if the queue was cleaned up on exit, putting
-the disk *is* still required, and likewise, blk_cleanup_queue() on
-a null queue should not happen now as disk->queue is valid from
-disk allocation time on.
-
-Automatic backport code scrapers should hopefully not cherry pick
-this patch as a stable fix candidate without full due dilligence to
-ensure all the work done on the block layer to make this happen is
-merged first.
-
-Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
-Link: https://lore.kernel.org/r/20210927220302.1073499-3-mcgrof@kernel.org
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/block/floppy.c | 13 -------------
- 1 file changed, 13 deletions(-)
-
-diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
-index fef79ea52e3ed..3e6390fd5f2be 100644
---- a/drivers/block/floppy.c
-+++ b/drivers/block/floppy.c
-@@ -4953,19 +4953,6 @@ static void __exit floppy_module_exit(void)
-                               blk_cleanup_queue(disks[drive][i]->queue);
-               }
-               blk_mq_free_tag_set(&tag_sets[drive]);
--
--              /*
--               * These disks have not called add_disk().  Don't put down
--               * queue reference in put_disk().
--               */
--              if (!(allowed_drive_mask & (1 << drive)) ||
--                  fdc_state[FDC(drive)].version == FDC_NONE) {
--                      for (i = 0; i < ARRAY_SIZE(floppy_type); i++) {
--                              if (disks[drive][i])
--                                      disks[drive][i]->queue = NULL;
--                      }
--              }
--
-               for (i = 0; i < ARRAY_SIZE(floppy_type); i++) {
-                       if (disks[drive][i])
-                               put_disk(disks[drive][i]);
--- 
-2.33.0
-

diff --git a/queue-5.14/floppy-use-blk_cleanup_disk.patch b/queue-5.14/floppy-use-blk_cleanup_disk.patch
deleted file mode 100644 (file)
index e344086..0000000
--- a/queue-5.14/floppy-use-blk_cleanup_disk.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 630bbade23d7da6e8b1920e35f6653f73bc05acc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 Sep 2021 15:02:51 -0700
-Subject: floppy: use blk_cleanup_disk()
-
-From: Luis Chamberlain <mcgrof@kernel.org>
-
-[ Upstream commit 3776339ae7acaf9590c668e86f45005fc9aff014 ]
-
-Use the blk_cleanup_queue() followed by put_disk() can be
-replaced with blk_cleanup_disk(). No need for two separate
-loops.
-
-Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
-Link: https://lore.kernel.org/r/20210927220302.1073499-4-mcgrof@kernel.org
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/block/floppy.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
-index 3e6390fd5f2be..9538146e520e0 100644
---- a/drivers/block/floppy.c
-+++ b/drivers/block/floppy.c
-@@ -4950,13 +4950,9 @@ static void __exit floppy_module_exit(void)
-               }
-               for (i = 0; i < ARRAY_SIZE(floppy_type); i++) {
-                       if (disks[drive][i])
--                              blk_cleanup_queue(disks[drive][i]->queue);
-+                              blk_cleanup_disk(disks[drive][i]);
-               }
-               blk_mq_free_tag_set(&tag_sets[drive]);
--              for (i = 0; i < ARRAY_SIZE(floppy_type); i++) {
--                      if (disks[drive][i])
--                              put_disk(disks[drive][i]);
--              }
-       }
- 
-       cancel_delayed_work_sync(&fd_timeout);
--- 
-2.33.0
-

diff --git a/queue-5.14/series b/queue-5.14/series
index e325e62665ff1374cfee11a10d775c2eeed1018a..df46d951c98f772bb8df1870493492fd08398014 100644 (file)
--- a/queue-5.14/series
+++ b/queue-5.14/series
@@ -280,8 +280,6 @@ thermal-core-fix-null-pointer-dereference-in-thermal.patch
 drm-msm-prevent-null-dereference-in-msm_gpu_crashsta.patch
 thermal-drivers-tsens-add-timeout-to-get_temp_tsens_.patch
 block-bump-max-plugged-deferred-size-from-16-to-32.patch
-floppy-fix-add_disk-assumption-on-exit-due-to-new-de.patch
-floppy-use-blk_cleanup_disk.patch
 floppy-fix-calling-platform_device_unregister-on-inv.patch
 md-update-superblock-after-changing-rdev-flags-in-st.patch
 memstick-r592-fix-a-uaf-bug-when-removing-the-driver.patch

diff --git a/queue-5.15/floppy-fix-add_disk-assumption-on-exit-due-to-new-de.patch b/queue-5.15/floppy-fix-add_disk-assumption-on-exit-due-to-new-de.patch
deleted file mode 100644 (file)
index 593cb12..0000000
--- a/queue-5.15/floppy-fix-add_disk-assumption-on-exit-due-to-new-de.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 381ba3e2d0f8a32816afad4cab09c11a4d6b32b4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 Sep 2021 15:02:50 -0700
-Subject: floppy: fix add_disk() assumption on exit due to new developments
-
-From: Luis Chamberlain <mcgrof@kernel.org>
-
-[ Upstream commit 2598a2bb357d64baaa94368133ddbc900b9eb246 ]
-
-After the patch titled "floppy: use blk_mq_alloc_disk and
-blk_cleanup_disk" the floppy driver was modified to allocate
-the blk_mq_alloc_disk() which allocates the disk with the
-queue. This is further clarified later with the patch titled
-"block: remove alloc_disk and alloc_disk_node". This clarifies
-that:
-
-   Most drivers should use and have been converted to use
-   blk_alloc_disk and blk_mq_alloc_disk.  Only the scsi
-   ULPs and dasd still allocate a disk separately from the
-   request_queue so don't bother with convenience macros for
-   something that should not see significant new users and
-   remove these wrappers.
-
-And then we have the patch titled, "block: hold a request_queue
-reference for the lifetime of struct gendisk" which ensures
-that a queue is *always* present for sure during the entire
-lifetime of a disk.
-
-In the floppy driver's case then the disk always comes with the
-queue. So even if even if the queue was cleaned up on exit, putting
-the disk *is* still required, and likewise, blk_cleanup_queue() on
-a null queue should not happen now as disk->queue is valid from
-disk allocation time on.
-
-Automatic backport code scrapers should hopefully not cherry pick
-this patch as a stable fix candidate without full due dilligence to
-ensure all the work done on the block layer to make this happen is
-merged first.
-
-Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
-Link: https://lore.kernel.org/r/20210927220302.1073499-3-mcgrof@kernel.org
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/block/floppy.c | 13 -------------
- 1 file changed, 13 deletions(-)
-
-diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
-index fef79ea52e3ed..3e6390fd5f2be 100644
---- a/drivers/block/floppy.c
-+++ b/drivers/block/floppy.c
-@@ -4953,19 +4953,6 @@ static void __exit floppy_module_exit(void)
-                               blk_cleanup_queue(disks[drive][i]->queue);
-               }
-               blk_mq_free_tag_set(&tag_sets[drive]);
--
--              /*
--               * These disks have not called add_disk().  Don't put down
--               * queue reference in put_disk().
--               */
--              if (!(allowed_drive_mask & (1 << drive)) ||
--                  fdc_state[FDC(drive)].version == FDC_NONE) {
--                      for (i = 0; i < ARRAY_SIZE(floppy_type); i++) {
--                              if (disks[drive][i])
--                                      disks[drive][i]->queue = NULL;
--                      }
--              }
--
-               for (i = 0; i < ARRAY_SIZE(floppy_type); i++) {
-                       if (disks[drive][i])
-                               put_disk(disks[drive][i]);
--- 
-2.33.0
-

diff --git a/queue-5.15/floppy-use-blk_cleanup_disk.patch b/queue-5.15/floppy-use-blk_cleanup_disk.patch
deleted file mode 100644 (file)
index cf38d19..0000000
--- a/queue-5.15/floppy-use-blk_cleanup_disk.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ec23ce0f12f37d36e449335c30fb95b7f84687b1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 Sep 2021 15:02:51 -0700
-Subject: floppy: use blk_cleanup_disk()
-
-From: Luis Chamberlain <mcgrof@kernel.org>
-
-[ Upstream commit 3776339ae7acaf9590c668e86f45005fc9aff014 ]
-
-Use the blk_cleanup_queue() followed by put_disk() can be
-replaced with blk_cleanup_disk(). No need for two separate
-loops.
-
-Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
-Link: https://lore.kernel.org/r/20210927220302.1073499-4-mcgrof@kernel.org
-Signed-off-by: Jens Axboe <axboe@kernel.dk>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/block/floppy.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
-index 3e6390fd5f2be..9538146e520e0 100644
---- a/drivers/block/floppy.c
-+++ b/drivers/block/floppy.c
-@@ -4950,13 +4950,9 @@ static void __exit floppy_module_exit(void)
-               }
-               for (i = 0; i < ARRAY_SIZE(floppy_type); i++) {
-                       if (disks[drive][i])
--                              blk_cleanup_queue(disks[drive][i]->queue);
-+                              blk_cleanup_disk(disks[drive][i]);
-               }
-               blk_mq_free_tag_set(&tag_sets[drive]);
--              for (i = 0; i < ARRAY_SIZE(floppy_type); i++) {
--                      if (disks[drive][i])
--                              put_disk(disks[drive][i]);
--              }
-       }
- 
-       cancel_delayed_work_sync(&fd_timeout);
--- 
-2.33.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index ed2a639fc866a24862850031574e14a280d78819..a9efc658a70c7ee9b9797af90bcf16824d30586d 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -261,8 +261,6 @@ thermal-core-fix-null-pointer-dereference-in-thermal.patch
 drm-msm-prevent-null-dereference-in-msm_gpu_crashsta.patch
 thermal-drivers-tsens-add-timeout-to-get_temp_tsens_.patch
 block-bump-max-plugged-deferred-size-from-16-to-32.patch
-floppy-fix-add_disk-assumption-on-exit-due-to-new-de.patch
-floppy-use-blk_cleanup_disk.patch
 floppy-fix-calling-platform_device_unregister-on-inv.patch
 md-update-superblock-after-changing-rdev-flags-in-st.patch
 memstick-r592-fix-a-uaf-bug-when-removing-the-driver.patch