block: make the new blkzoned UAPI constants discoverable
Subsystems (2)
PATCH 1/1 block: make the new blkzoned UAPI constants discoverable
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.
--- include/uapi/linux/blkzoned.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
include/uapi/linux/blkzoned.h +4 -2
@@ -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 };/**
Signature · 1 line
2.47.3
Quoted 8 lines · Christoph Hellwig
The Linux 6.19 merge window added the new BLKREPORTZONESV2 ioctl, and with it the new
BLK_ZONE_REP_CACHEDandBLK_ZONE_COND_ACTIVEconstants.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,
Signature · 1 line
Jens Axboe
Quoted 7 lines · Christoph Hellwig
The Linux 6.19 merge window added the new BLKREPORTZONESV2 ioctl, and with it the new
BLK_ZONE_REP_CACHEDandBLK_ZONE_COND_ACTIVEconstants.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.
Quoted 7 lines
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 <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>
Signature · 2 lines
Damien Le Moal Western Digital Research