From: Greg Kroah-Hartman Date: Thu, 15 Jan 2026 11:41:59 +0000 (+0100) Subject: drop bcache-fix-improper-use-of-bi_end_io.patch from everywhere X-Git-Tag: v6.6.121~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a9d9a5fd3160b30a3a4c4f5e4784e40ae762c81;p=thirdparty%2Fkernel%2Fstable-queue.git drop bcache-fix-improper-use-of-bi_end_io.patch from everywhere --- diff --git a/queue-6.1/bcache-fix-improper-use-of-bi_end_io.patch b/queue-6.1/bcache-fix-improper-use-of-bi_end_io.patch deleted file mode 100644 index b2e6af3408..0000000000 --- a/queue-6.1/bcache-fix-improper-use-of-bi_end_io.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ea0e23f93c78d8ca22abe5739808fe20d6a41f74 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 9 Dec 2025 17:01:56 +0800 -Subject: bcache: fix improper use of bi_end_io - -From: Shida Zhang - -[ Upstream commit 53280e398471f0bddbb17b798a63d41264651325 ] - -Don't call bio->bi_end_io() directly. Use the bio_endio() helper -function instead, which handles completion more safely and uniformly. - -Suggested-by: Christoph Hellwig -Reviewed-by: Christoph Hellwig -Signed-off-by: Shida Zhang -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/md/bcache/request.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c -index 3427555b0ccae..6a1bd0c49d2b9 100644 ---- a/drivers/md/bcache/request.c -+++ b/drivers/md/bcache/request.c -@@ -1090,7 +1090,7 @@ static void detached_dev_end_io(struct bio *bio) - } - - kfree(ddip); -- bio->bi_end_io(bio); -+ bio_endio(bio); - } - - static void detached_dev_do_request(struct bcache_device *d, struct bio *bio, -@@ -1107,7 +1107,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio, - ddip = kzalloc(sizeof(struct detached_dev_io_private), GFP_NOIO); - if (!ddip) { - bio->bi_status = BLK_STS_RESOURCE; -- bio->bi_end_io(bio); -+ bio_endio(bio); - return; - } - -@@ -1122,7 +1122,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio, - - if ((bio_op(bio) == REQ_OP_DISCARD) && - !bdev_max_discard_sectors(dc->bdev)) -- bio->bi_end_io(bio); -+ detached_dev_end_io(bio); - else - submit_bio_noacct(bio); - } --- -2.51.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 9e50c13d04..20f9aae319 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -21,7 +21,6 @@ arm-9461-1-disable-highpte-on-preempt_rt-kernels.patch alpha-don-t-reference-obsolete-termio-struct-for-tc-.patch nfsv4-ensure-the-open-stateid-seqid-doesn-t-go-backw.patch nfs-fix-up-the-automount-fs_context-to-use-the-corre.patch -bcache-fix-improper-use-of-bi_end_io.patch smb-client-fix-nt_status_unable_to_free_vm-value.patch smb-client-fix-nt_status_device_door_open-value.patch smb-client-fix-nt_status_no_data_detected-value.patch diff --git a/queue-6.12/bcache-fix-improper-use-of-bi_end_io.patch b/queue-6.12/bcache-fix-improper-use-of-bi_end_io.patch deleted file mode 100644 index 5fd0d7aa12..0000000000 --- a/queue-6.12/bcache-fix-improper-use-of-bi_end_io.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6c4579ac46128404dcfb1bea2774ebddcd0b0074 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 9 Dec 2025 17:01:56 +0800 -Subject: bcache: fix improper use of bi_end_io - -From: Shida Zhang - -[ Upstream commit 53280e398471f0bddbb17b798a63d41264651325 ] - -Don't call bio->bi_end_io() directly. Use the bio_endio() helper -function instead, which handles completion more safely and uniformly. - -Suggested-by: Christoph Hellwig -Reviewed-by: Christoph Hellwig -Signed-off-by: Shida Zhang -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/md/bcache/request.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c -index af345dc6fde14..82fdea7dea7aa 100644 ---- a/drivers/md/bcache/request.c -+++ b/drivers/md/bcache/request.c -@@ -1104,7 +1104,7 @@ static void detached_dev_end_io(struct bio *bio) - } - - kfree(ddip); -- bio->bi_end_io(bio); -+ bio_endio(bio); - } - - static void detached_dev_do_request(struct bcache_device *d, struct bio *bio, -@@ -1121,7 +1121,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio, - ddip = kzalloc(sizeof(struct detached_dev_io_private), GFP_NOIO); - if (!ddip) { - bio->bi_status = BLK_STS_RESOURCE; -- bio->bi_end_io(bio); -+ bio_endio(bio); - return; - } - -@@ -1136,7 +1136,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio, - - if ((bio_op(bio) == REQ_OP_DISCARD) && - !bdev_max_discard_sectors(dc->bdev)) -- bio->bi_end_io(bio); -+ detached_dev_end_io(bio); - else - submit_bio_noacct(bio); - } --- -2.51.0 - diff --git a/queue-6.12/series b/queue-6.12/series index 2fbf65d585..9039ae1804 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -36,7 +36,6 @@ nfsv4-ensure-the-open-stateid-seqid-doesn-t-go-backw.patch asoc-rockchip-fix-wvoid-pointer-to-enum-cast-warning.patch nfs-fix-up-the-automount-fs_context-to-use-the-corre.patch drm-amd-display-shrink-struct-members.patch -bcache-fix-improper-use-of-bi_end_io.patch smb-client-fix-nt_status_unable_to_free_vm-value.patch smb-client-fix-nt_status_device_door_open-value.patch smb-client-fix-nt_status_no_data_detected-value.patch diff --git a/queue-6.18/bcache-fix-improper-use-of-bi_end_io.patch b/queue-6.18/bcache-fix-improper-use-of-bi_end_io.patch deleted file mode 100644 index 969de04fdb..0000000000 --- a/queue-6.18/bcache-fix-improper-use-of-bi_end_io.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a16d4f532d0ae2d7d4c3c0063cc62f97ffc8dd5d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 9 Dec 2025 17:01:56 +0800 -Subject: bcache: fix improper use of bi_end_io - -From: Shida Zhang - -[ Upstream commit 53280e398471f0bddbb17b798a63d41264651325 ] - -Don't call bio->bi_end_io() directly. Use the bio_endio() helper -function instead, which handles completion more safely and uniformly. - -Suggested-by: Christoph Hellwig -Reviewed-by: Christoph Hellwig -Signed-off-by: Shida Zhang -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/md/bcache/request.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c -index af345dc6fde14..82fdea7dea7aa 100644 ---- a/drivers/md/bcache/request.c -+++ b/drivers/md/bcache/request.c -@@ -1104,7 +1104,7 @@ static void detached_dev_end_io(struct bio *bio) - } - - kfree(ddip); -- bio->bi_end_io(bio); -+ bio_endio(bio); - } - - static void detached_dev_do_request(struct bcache_device *d, struct bio *bio, -@@ -1121,7 +1121,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio, - ddip = kzalloc(sizeof(struct detached_dev_io_private), GFP_NOIO); - if (!ddip) { - bio->bi_status = BLK_STS_RESOURCE; -- bio->bi_end_io(bio); -+ bio_endio(bio); - return; - } - -@@ -1136,7 +1136,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio, - - if ((bio_op(bio) == REQ_OP_DISCARD) && - !bdev_max_discard_sectors(dc->bdev)) -- bio->bi_end_io(bio); -+ detached_dev_end_io(bio); - else - submit_bio_noacct(bio); - } --- -2.51.0 - diff --git a/queue-6.18/series b/queue-6.18/series index 252f790d3d..c2299e3fb6 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -54,7 +54,6 @@ asoc-rockchip-fix-wvoid-pointer-to-enum-cast-warning.patch nfs-fix-up-the-automount-fs_context-to-use-the-corre.patch alsa-hda-realtek-add-support-for-asus-um3406ga.patch drm-amd-display-shrink-struct-members.patch -bcache-fix-improper-use-of-bi_end_io.patch smb-client-fix-nt_status_unable_to_free_vm-value.patch smb-client-fix-nt_status_device_door_open-value.patch smb-client-fix-nt_status_no_data_detected-value.patch diff --git a/queue-6.6/bcache-fix-improper-use-of-bi_end_io.patch b/queue-6.6/bcache-fix-improper-use-of-bi_end_io.patch deleted file mode 100644 index c4081e5f8d..0000000000 --- a/queue-6.6/bcache-fix-improper-use-of-bi_end_io.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 81e7e43a810e8f40e163928d441de02d2816b073 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 9 Dec 2025 17:01:56 +0800 -Subject: bcache: fix improper use of bi_end_io - -From: Shida Zhang - -[ Upstream commit 53280e398471f0bddbb17b798a63d41264651325 ] - -Don't call bio->bi_end_io() directly. Use the bio_endio() helper -function instead, which handles completion more safely and uniformly. - -Suggested-by: Christoph Hellwig -Reviewed-by: Christoph Hellwig -Signed-off-by: Shida Zhang -Signed-off-by: Jens Axboe -Signed-off-by: Sasha Levin ---- - drivers/md/bcache/request.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c -index a9b1f3896249b..b4059d2daa326 100644 ---- a/drivers/md/bcache/request.c -+++ b/drivers/md/bcache/request.c -@@ -1090,7 +1090,7 @@ static void detached_dev_end_io(struct bio *bio) - } - - kfree(ddip); -- bio->bi_end_io(bio); -+ bio_endio(bio); - } - - static void detached_dev_do_request(struct bcache_device *d, struct bio *bio, -@@ -1107,7 +1107,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio, - ddip = kzalloc(sizeof(struct detached_dev_io_private), GFP_NOIO); - if (!ddip) { - bio->bi_status = BLK_STS_RESOURCE; -- bio->bi_end_io(bio); -+ bio_endio(bio); - return; - } - -@@ -1122,7 +1122,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio, - - if ((bio_op(bio) == REQ_OP_DISCARD) && - !bdev_max_discard_sectors(dc->bdev)) -- bio->bi_end_io(bio); -+ detached_dev_end_io(bio); - else - submit_bio_noacct(bio); - } --- -2.51.0 - diff --git a/queue-6.6/series b/queue-6.6/series index a971647a94..e1ceac56a9 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -31,7 +31,6 @@ alpha-don-t-reference-obsolete-termio-struct-for-tc-.patch dm-snapshot-fix-scheduling-while-atomic-on-real-time.patch nfsv4-ensure-the-open-stateid-seqid-doesn-t-go-backw.patch nfs-fix-up-the-automount-fs_context-to-use-the-corre.patch -bcache-fix-improper-use-of-bi_end_io.patch smb-client-fix-nt_status_unable_to_free_vm-value.patch smb-client-fix-nt_status_device_door_open-value.patch smb-client-fix-nt_status_no_data_detected-value.patch