block/blk-iocost (gcc13): keep large values in a new enum
Subsystems (3)
PATCH v3 1/1 block/blk-iocost (gcc13): keep large values in a new enum
Since gcc13, each member of an enum has the same type as the enum [1]. And that is inherited from its members. Provided:
VTIME_PER_SEC_SHIFT = 37,
VTIME_PER_SEC = 1LLU << VTIME_PER_SEC_SHIFT,
...
AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC,
the named type is unsigned long.
This generates warnings with gcc-13:
block/blk-iocost.c: In function 'ioc_weight_prfill':
block/blk-iocost.c:3037:37: error: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'long unsigned int'
block/blk-iocost.c: In function 'ioc_weight_show':
block/blk-iocost.c:3047:34: error: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'long unsigned int'
So split the anonumois enum with large values to a separate enum, so that they don't affect other members.
[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36113
---
Notes:
[v3] move more to a new enum (effectively split the enums) [v2] move to a new enum
block/blk-iocost.c | 2 ++ 1 file changed, 2 insertions(+)
block/blk-iocost.c +2 -0
@@ -232,7 +232,9 @@ enum {/* 1/64k is granular enough and can easily be handled w/ u32 */ WEIGHT_ONE = 1 << 16, +}; +enum {/* * As vtime is used to calculate the cost of each IO, it needs to * be fairly high precision. For example, it should be able to
Signature · 1 line
2.39.0
Jens Axboe
maintainerQuoted 8 lines · Jiri Slaby (SUSE)
Since gcc13, each member of an enum has the same type as the enum [1]. And that is inherited from its members. Provided:
VTIME_PER_SEC_SHIFT= 37,
VTIME_PER_SEC= 1LLU <<VTIME_PER_SEC_SHIFT,
...
AUTOP_CYCLE_NSEC= 10LLU *NSEC_PER_SEC,
the named type is unsigned long.
Quoted 8 lines
This generates warnings with gcc-13:
block/blk-iocost.c: In function 'ioc_weight_prfill':
block/blk-iocost.c:3037:37: error: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'long unsigned int'
block/blk-iocost.c: In function 'ioc_weight_show':
block/blk-iocost.c:3047:34: error: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'long unsigned int'So split the anonumois enum with large values to a separate enum, so
anonymous?
Signature · 1 line
Jens Axboe
Quoted 9 lines · Jiri Slaby (SUSE)
Since gcc13, each member of an enum has the same type as the enum [1]. And that is inherited from its members. Provided:
VTIME_PER_SEC_SHIFT= 37,
VTIME_PER_SEC= 1LLU <<VTIME_PER_SEC_SHIFT,
...
AUTOP_CYCLE_NSEC= 10LLU *NSEC_PER_SEC,
the named type is unsigned long.[...]
Applied, thanks!
[1/1] block/blk-iocost (gcc13): keep large values in a new enum
commit: ff1cc97b1f4c10db224f276d9615b22835b8c424
Best regards,
Signature · 1 line
Jens Axboe