]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
block: make the new blkzoned UAPI constants discoverable
authorChristoph Hellwig <hch@lst.de>
Wed, 21 Jan 2026 07:31:49 +0000 (08:31 +0100)
committerJens Axboe <axboe@kernel.dk>
Wed, 21 Jan 2026 14:47:44 +0000 (07:47 -0700)
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: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
include/uapi/linux/blkzoned.h

index e33f027033508216b02a27c82ed3d8d73f17f8be..66383612096678791c401b6ff6e769f4f9a1c660 100644 (file)
@@ -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
 };
 
 /**