Commit 3f66ccba authored by Damien Le Moal's avatar Damien Le Moal Committed by Jens Axboe
Browse files

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.

Fixes: 6c1b1da5 ("block: add zone open, close and finish operations")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20250625093327.548866-2-dlemoal@kernel.org


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 9b8b8487

include/linux/blk_types.h

+3 −3
Original line number Diff line number Diff line
@@ -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,