drop broken dm-flakey patch from 5.10 and older kernels

diff --git a/queue-4.14/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch b/queue-4.14/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch
deleted file mode 100644 (file)
index 9475c10..0000000
--- a/queue-4.14/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 Mon Sep 17 00:00:00 2001
-From: Mikulas Patocka <mpatocka@redhat.com>
-Date: Sun, 22 Jan 2023 14:03:31 -0500
-Subject: dm flakey: fix a bug with 32-bit highmem systems
-
-From: Mikulas Patocka <mpatocka@redhat.com>
-
-commit 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 upstream.
-
-The function page_address does not work with 32-bit systems with high
-memory. Use bvec_kmap_local/kunmap_local instead.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
-Reviewed-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
-Signed-off-by: Mike Snitzer <snitzer@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm-flakey.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/md/dm-flakey.c
-+++ b/drivers/md/dm-flakey.c
-@@ -305,8 +305,9 @@ static void corrupt_bio_data(struct bio
-                       struct page *page = bio_iter_page(bio, iter);
-                       if (unlikely(page == ZERO_PAGE(0)))
-                               break;
--                      segment = (page_address(page) + bio_iter_offset(bio, iter));
-+                      segment = bvec_kmap_local(&bvec);
-                       segment[corrupt_bio_byte] = fc->corrupt_bio_value;
-+                      kunmap_local(segment);
-                       DMDEBUG("Corrupting data bio=%p by writing %u to byte %u "
-                               "(rw=%c bi_opf=%u bi_sector=%llu size=%u)\n",
-                               bio, fc->corrupt_bio_value, fc->corrupt_bio_byte,

diff --git a/queue-4.14/series b/queue-4.14/series
index 6c3434877730f70116af692e64e2b2260f1f484e..bb274faf13eb089a74b637196862a81ef471dedf 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -134,7 +134,6 @@ wifi-cfg80211-fix-use-after-free-for-wext.patch
 thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch
 dm-flakey-fix-logic-when-corrupting-a-bio.patch
 dm-flakey-don-t-corrupt-the-zero-page.patch
-dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch
 arm-dts-exynos-correct-tmu-phandle-in-exynos4.patch
 arm-dts-exynos-correct-tmu-phandle-in-odroid-xu.patch
 rbd-avoid-use-after-free-in-do_rbd_add-when-rbd_dev_create-fails.patch

diff --git a/queue-4.19/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch b/queue-4.19/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch
deleted file mode 100644 (file)
index 9475c10..0000000
--- a/queue-4.19/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 Mon Sep 17 00:00:00 2001
-From: Mikulas Patocka <mpatocka@redhat.com>
-Date: Sun, 22 Jan 2023 14:03:31 -0500
-Subject: dm flakey: fix a bug with 32-bit highmem systems
-
-From: Mikulas Patocka <mpatocka@redhat.com>
-
-commit 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 upstream.
-
-The function page_address does not work with 32-bit systems with high
-memory. Use bvec_kmap_local/kunmap_local instead.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
-Reviewed-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
-Signed-off-by: Mike Snitzer <snitzer@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm-flakey.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/md/dm-flakey.c
-+++ b/drivers/md/dm-flakey.c
-@@ -305,8 +305,9 @@ static void corrupt_bio_data(struct bio
-                       struct page *page = bio_iter_page(bio, iter);
-                       if (unlikely(page == ZERO_PAGE(0)))
-                               break;
--                      segment = (page_address(page) + bio_iter_offset(bio, iter));
-+                      segment = bvec_kmap_local(&bvec);
-                       segment[corrupt_bio_byte] = fc->corrupt_bio_value;
-+                      kunmap_local(segment);
-                       DMDEBUG("Corrupting data bio=%p by writing %u to byte %u "
-                               "(rw=%c bi_opf=%u bi_sector=%llu size=%u)\n",
-                               bio, fc->corrupt_bio_value, fc->corrupt_bio_byte,

diff --git a/queue-4.19/series b/queue-4.19/series
index cc9ff92bc681467a46e0e8cacf5cb84917c1c39c..100e47e98358a0826dae997ced1e9c38b369f004 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -178,7 +178,6 @@ wifi-cfg80211-fix-use-after-free-for-wext.patch
 thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch
 dm-flakey-fix-logic-when-corrupting-a-bio.patch
 dm-flakey-don-t-corrupt-the-zero-page.patch
-dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch
 arm-dts-exynos-correct-tmu-phandle-in-exynos4.patch
 arm-dts-exynos-correct-tmu-phandle-in-odroid-xu.patch
 rbd-avoid-use-after-free-in-do_rbd_add-when-rbd_dev_create-fails.patch

diff --git a/queue-5.10/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch b/queue-5.10/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch
deleted file mode 100644 (file)
index 9475c10..0000000
--- a/queue-5.10/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 Mon Sep 17 00:00:00 2001
-From: Mikulas Patocka <mpatocka@redhat.com>
-Date: Sun, 22 Jan 2023 14:03:31 -0500
-Subject: dm flakey: fix a bug with 32-bit highmem systems
-
-From: Mikulas Patocka <mpatocka@redhat.com>
-
-commit 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 upstream.
-
-The function page_address does not work with 32-bit systems with high
-memory. Use bvec_kmap_local/kunmap_local instead.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
-Reviewed-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
-Signed-off-by: Mike Snitzer <snitzer@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm-flakey.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/md/dm-flakey.c
-+++ b/drivers/md/dm-flakey.c
-@@ -305,8 +305,9 @@ static void corrupt_bio_data(struct bio
-                       struct page *page = bio_iter_page(bio, iter);
-                       if (unlikely(page == ZERO_PAGE(0)))
-                               break;
--                      segment = (page_address(page) + bio_iter_offset(bio, iter));
-+                      segment = bvec_kmap_local(&bvec);
-                       segment[corrupt_bio_byte] = fc->corrupt_bio_value;
-+                      kunmap_local(segment);
-                       DMDEBUG("Corrupting data bio=%p by writing %u to byte %u "
-                               "(rw=%c bi_opf=%u bi_sector=%llu size=%u)\n",
-                               bio, fc->corrupt_bio_value, fc->corrupt_bio_byte,

diff --git a/queue-5.10/series b/queue-5.10/series
index 0e02c2bf13dc0692e835de8d7ce4db70bcd4c2f1..d4bf37ed76be95033cb227e6adc5eea82e056c14 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -392,7 +392,6 @@ wifi-cfg80211-fix-use-after-free-for-wext.patch
 thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch
 dm-flakey-fix-logic-when-corrupting-a-bio.patch
 dm-flakey-don-t-corrupt-the-zero-page.patch
-dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch
 arm-dts-exynos-correct-tmu-phandle-in-exynos4210.patch
 arm-dts-exynos-correct-tmu-phandle-in-exynos4.patch
 arm-dts-exynos-correct-tmu-phandle-in-odroid-xu3-family.patch

diff --git a/queue-5.4/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch b/queue-5.4/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch
deleted file mode 100644 (file)
index 9475c10..0000000
--- a/queue-5.4/dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 Mon Sep 17 00:00:00 2001
-From: Mikulas Patocka <mpatocka@redhat.com>
-Date: Sun, 22 Jan 2023 14:03:31 -0500
-Subject: dm flakey: fix a bug with 32-bit highmem systems
-
-From: Mikulas Patocka <mpatocka@redhat.com>
-
-commit 8eb29c4fbf9661e6bd4dd86197a37ffe0ecc9d50 upstream.
-
-The function page_address does not work with 32-bit systems with high
-memory. Use bvec_kmap_local/kunmap_local instead.
-
-Cc: stable@vger.kernel.org
-Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
-Reviewed-by: Sweet Tea Dorminy <sweettea-kernel@dorminy.me>
-Signed-off-by: Mike Snitzer <snitzer@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/md/dm-flakey.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/md/dm-flakey.c
-+++ b/drivers/md/dm-flakey.c
-@@ -305,8 +305,9 @@ static void corrupt_bio_data(struct bio
-                       struct page *page = bio_iter_page(bio, iter);
-                       if (unlikely(page == ZERO_PAGE(0)))
-                               break;
--                      segment = (page_address(page) + bio_iter_offset(bio, iter));
-+                      segment = bvec_kmap_local(&bvec);
-                       segment[corrupt_bio_byte] = fc->corrupt_bio_value;
-+                      kunmap_local(segment);
-                       DMDEBUG("Corrupting data bio=%p by writing %u to byte %u "
-                               "(rw=%c bi_opf=%u bi_sector=%llu size=%u)\n",
-                               bio, fc->corrupt_bio_value, fc->corrupt_bio_byte,

diff --git a/queue-5.4/series b/queue-5.4/series
index 4517f79e6af69c993e005b6745ca141129c54415..1e3d8fdc53fdd82565a42c874e84fbd00181da33 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -258,7 +258,6 @@ wifi-cfg80211-fix-use-after-free-for-wext.patch
 thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch
 dm-flakey-fix-logic-when-corrupting-a-bio.patch
 dm-flakey-don-t-corrupt-the-zero-page.patch
-dm-flakey-fix-a-bug-with-32-bit-highmem-systems.patch
 arm-dts-exynos-correct-tmu-phandle-in-exynos4.patch
 arm-dts-exynos-correct-tmu-phandle-in-odroid-xu.patch
 rbd-avoid-use-after-free-in-do_rbd_add-when-rbd_dev_create-fails.patch