FAILED: patch "[PATCH] block: Make REQ_OP_ZONE_FINISH a write operation" failed to apply to 5.10-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 3f66ccbaaef3a0c5bd844eab04e3207b4061c546
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025081544-coliseum-cylinder-43d2@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 3f66ccbaaef3a0c5bd844eab04e3207b4061c546 Mon Sep 17 00:00:00 2001
From: Damien Le Moal <[email protected]>
Date: Wed, 25 Jun 2025 18:33:23 +0900
Subject: [PATCH] block: Make REQ_OP_ZONE_FINISH a write operation
REQ_OP_ZONE_FINISH is defined as "12", which makes op_is_write(REQ_OP_ZONE_FINISH) return false, despite the fact that a zone finish operation is an operation that modifies a zone (transition it to full) and so should be considered as a write operation (albeit one that does not transfer any data to the device).
Fix this by redefining REQ_OP_ZONE_FINISH to be an odd number (13), and redefine REQ_OP_ZONE_RESET and REQ_OP_ZONE_RESET_ALL using sequential odd numbers from that new value.
include/linux/blk_types.h +3 -3
@@ -350,11 +350,11 @@ enum req_op {/* Close a zone */ REQ_OP_ZONE_CLOSE = (__force blk_opf_t )11 ,/* Transition a zone to full */ -REQ_OP_ZONE_FINISH = (__force blk_opf_t )12 , +REQ_OP_ZONE_FINISH = (__force blk_opf_t )13 ,/* reset a zone write pointer */ -REQ_OP_ZONE_RESET = (__force blk_opf_t )13 , +REQ_OP_ZONE_RESET = (__force blk_opf_t )15 ,/* reset all the zone present on the device */ -REQ_OP_ZONE_RESET_ALL = (__force blk_opf_t )15 , +REQ_OP_ZONE_RESET_ALL = (__force blk_opf_t )17 ,/* Driver private requests */ REQ_OP_DRV_IN = (__force blk_opf_t)34,
Sasha Levin
maintainerPATCH 1/1 block: Make REQ_OP_ZONE_FINISH a write operation
From: Damien Le Moal <[email protected]>
[ Upstream commit 3f66ccbaaef3a0c5bd844eab04e3207b4061c546 ]
REQ_OP_ZONE_FINISH is defined as "12", which makes op_is_write(REQ_OP_ZONE_FINISH) return false, despite the fact that a zone finish operation is an operation that modifies a zone (transition it to full) and so should be considered as a write operation (albeit one that does not transfer any data to the device).
Fix this by redefining REQ_OP_ZONE_FINISH to be an odd number (13), and redefine REQ_OP_ZONE_RESET and REQ_OP_ZONE_RESET_ALL using sequential odd numbers from that new value.
--- include/linux/blk_types.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/linux/blk_types.h +4 -4
@@ -353,13 +353,13 @@ enum req_opf {/* Close a zone */ REQ_OP_ZONE_CLOSE =11 ,/* Transition a zone to full */ -REQ_OP_ZONE_FINISH =12 , +REQ_OP_ZONE_FINISH =13 ,/* write data at the current zone write pointer */ -REQ_OP_ZONE_APPEND =13 , +REQ_OP_ZONE_APPEND =15 ,/* reset a zone write pointer */ -REQ_OP_ZONE_RESET =15 , +REQ_OP_ZONE_RESET =17 ,/* reset all the zone present on the device */ -REQ_OP_ZONE_RESET_ALL =17 , +REQ_OP_ZONE_RESET_ALL =19 ,/* SCSI passthrough using struct scsi_request */ REQ_OP_SCSI_IN = 32,
Signature · 1 line
2.50.1