[PATCH for-6.19] block: make the new blkzoned UAPI constants discoverable

[PATCH for-6.19] block: make the new blkzoned UAPI constants discoverable

[Christoph Hellwig]

The Linux 6.19 merge window added the new BLKREPORTZONESV2 ioctl, and
with it the new BLK_ZONE_REP_CACHED and BLK_ZONE_COND_ACTIVE constants.

The two constants are defined as part of enums, which makes it very
painful for userspace to discover if they are present in the installed
system headers.

Use the #define to the same name trick to make them trivially
discoverable using CPP directives.

Fixes: 0bf0e2e46668 ("block: track zone conditions")
Fixes: b30ffcdc0c15 ("block: introduce BLKREPORTZONESV2 ioctl")
Reported-by: Andrey Albershteyn <aalbersh@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/uapi/linux/blkzoned.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/uapi/linux/blkzoned.h b/include/uapi/linux/blkzoned.h
index e33f02703350..663836120966 100644
--- a/include/uapi/linux/blkzoned.h
+++ b/include/uapi/linux/blkzoned.h
@@ -81,7 +81,8 @@ enum blk_zone_cond {
 	BLK_ZONE_COND_FULL	= 0xE,
 	BLK_ZONE_COND_OFFLINE	= 0xF,
 
-	BLK_ZONE_COND_ACTIVE	= 0xFF,
+	BLK_ZONE_COND_ACTIVE	= 0xFF, /* added in Linux 6.19 */
+#define BLK_ZONE_COND_ACTIVE	BLK_ZONE_COND_ACTIVE
 };
 
 /**
@@ -100,7 +101,8 @@ enum blk_zone_report_flags {
 	BLK_ZONE_REP_CAPACITY	= (1U << 0),
 
 	/* Input flags */
-	BLK_ZONE_REP_CACHED	= (1U << 31),
+	BLK_ZONE_REP_CACHED	= (1U << 31), /* added in Linux 6.19 */
+#define BLK_ZONE_REP_CACHED	BLK_ZONE_REP_CACHED
 };
 
 /**
-- 
2.47.3

Re: [PATCH for-6.19] block: make the new blkzoned UAPI constants discoverable

[Johannes Thumshirn]

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>

Re: [PATCH for-6.19] block: make the new blkzoned UAPI constants discoverable

[Jens Axboe]

On Wed, 21 Jan 2026 08:31:49 +0100, Christoph Hellwig wrote:
> The Linux 6.19 merge window added the new BLKREPORTZONESV2 ioctl, and
> with it the new BLK_ZONE_REP_CACHED and BLK_ZONE_COND_ACTIVE constants.
> 
> The two constants are defined as part of enums, which makes it very
> painful for userspace to discover if they are present in the installed
> system headers.
> 
> [...]

Applied, thanks!

[1/1] block: make the new blkzoned UAPI constants discoverable
      commit: f5f2bad67a45cd1ef6f5b727da104694a81b3666

Best regards,
-- 
Jens Axboe

Re: [PATCH for-6.19] block: make the new blkzoned UAPI constants discoverable

[Damien Le Moal]

On 2026/01/21 18:31, Christoph Hellwig wrote:
> The Linux 6.19 merge window added the new BLKREPORTZONESV2 ioctl, and
> with it the new BLK_ZONE_REP_CACHED and BLK_ZONE_COND_ACTIVE constants.
> 
> The two constants are defined as part of enums, which makes it very
> painful for userspace to discover if they are present in the installed
> system headers.
> 
> Use the #define to the same name trick to make them trivially
> discoverable using CPP directives.
> 
> Fixes: 0bf0e2e46668 ("block: track zone conditions")
> Fixes: b30ffcdc0c15 ("block: introduce BLKREPORTZONESV2 ioctl")
> Reported-by: Andrey Albershteyn <aalbersh@redhat.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Reviewed-by: Damien Le Moal <dlemoal@kernel.org>


-- 
Damien Le Moal
Western Digital Research