block: uapi: Fix compilation errors using ioprio.h with C++
PATCH 1/1 block: uapi: Fix compilation errors using ioprio.h with C++
The use of the "class" argument name in the ioprio_value() inline function in include/uapi/linux/ioprio.h confuses C++ compilers resulting in compilation errors such as:
/usr/include/linux/ioprio.h:110:43: error: expected primary-expression before ‘int’
110 | static __always_inline __u16 ioprio_value(int class, int level, int hint)
| ^~~
for user C++ programs including linux/ioprio.h.
Avoid these errors by renaming the arguments of the ioprio_value() function to prioclass, priolevel and priohint. For consistency, the arguments of the IOPRIO_PRIO_VALUE() and IOPRIO_PRIO_VALUE_HINT() macros are also renamed in the same manner.
--- include/uapi/linux/ioprio.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
include/uapi/linux/ioprio.h +11 -10
@@ -107,20 +107,21 @@ enum {/* * Return an I/O priority value based on a class, a level and a hint. */ -static __always_inline __u16 ioprio_value(int class, int level, int hint) +static __always_inline __u16 ioprio_value(int prioclass, int priolevel, +int priohint) { -if (IOPRIO_BAD_VALUE (class,IOPRIO_NR_CLASSES ) || -IOPRIO_BAD_VALUE (level,IOPRIO_NR_LEVELS ) || -IOPRIO_BAD_VALUE (hint,IOPRIO_NR_HINTS )) +if (IOPRIO_BAD_VALUE (prioclass,IOPRIO_NR_CLASSES ) || +IOPRIO_BAD_VALUE (priolevel,IOPRIO_NR_LEVELS ) || +IOPRIO_BAD_VALUE (priohint,IOPRIO_NR_HINTS ))return IOPRIO_CLASS_INVALID <<IOPRIO_CLASS_SHIFT ; -return (class <<IOPRIO_CLASS_SHIFT ) | - (hint <<IOPRIO_HINT_SHIFT ) | level; +return (prioclass <<IOPRIO_CLASS_SHIFT ) | + (priohint <<IOPRIO_HINT_SHIFT ) | priolevel; } -#define IOPRIO_PRIO_VALUE (class, level) \ - ioprio_value(class, level, IOPRIO_HINT_NONE) -#define IOPRIO_PRIO_VALUE_HINT (class, level, hint) \ - ioprio_value(class, level, hint) +#define IOPRIO_PRIO_VALUE (prioclass, priolevel) \ + ioprio_value(prioclass, priolevel, IOPRIO_HINT_NONE) +#define IOPRIO_PRIO_VALUE_HINT (prioclass, priolevel, priohint) \ + ioprio_value(prioclass, priolevel, priohint)#endif /* _UAPI_LINUX_IOPRIO_H */
Signature · 1 line
2.41.0
Quoted 10 lines · Damien Le Moal
The use of the "class" argument name in the
ioprio_value()inline function ininclude/uapi/linux/ioprio.hconfuses C++ compilers resulting in compilation errors such as:
/usr/include/linux/ioprio.h:110:43: error: expected primary-expression before ‘int’
110 | static__always_inline__u16ioprio_value(int class, int level, int hint)
| ^~~for user C++ programs including
linux/ioprio.h.
Quoted 8 lines
Avoid these errors by renaming the arguments of the
ioprio_value()function to prioclass, priolevel and priohint. For consistency, the arguments of theIOPRIO_PRIO_VALUE()andIOPRIO_PRIO_VALUE_HINT()macros are also renamed in the same manner.Reported-by Igor Pylypiv <[email protected]>Fixes 01584c1e2337 ("scsi: block: Improve ioprio value validity checks")Signed-off-by Damien Le Moal <[email protected]>
Thanks!
Quoted 43 lines
--- include/uapi/linux/ioprio.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)include/uapi/linux/ioprio.h +11
-10@@ -107,20 +107,21 @@ enum {/* * Return an I/O priority value based on a class, a level and a hint. */ -static __always_inline __u16 ioprio_value(int class, int level, int hint) +static __always_inline __u16 ioprio_value(int prioclass, int priolevel, +int priohint) { -if (IOPRIO_BAD_VALUE (class,IOPRIO_NR_CLASSES ) || -IOPRIO_BAD_VALUE (level,IOPRIO_NR_LEVELS ) || -IOPRIO_BAD_VALUE (hint,IOPRIO_NR_HINTS )) +if (IOPRIO_BAD_VALUE (prioclass,IOPRIO_NR_CLASSES ) || +IOPRIO_BAD_VALUE (priolevel,IOPRIO_NR_LEVELS ) || +IOPRIO_BAD_VALUE (priohint,IOPRIO_NR_HINTS ))return IOPRIO_CLASS_INVALID <<IOPRIO_CLASS_SHIFT ; -return (class <<IOPRIO_CLASS_SHIFT ) | - (hint <<IOPRIO_HINT_SHIFT ) | level; +return (prioclass <<IOPRIO_CLASS_SHIFT ) | + (priohint <<IOPRIO_HINT_SHIFT ) | priolevel; } -#define IOPRIO_PRIO_VALUE (class, level) \ - ioprio_value(class, level, IOPRIO_HINT_NONE) -#define IOPRIO_PRIO_VALUE_HINT (class, level, hint) \ - ioprio_value(class, level, hint) +#define IOPRIO_PRIO_VALUE (prioclass, priolevel) \ + ioprio_value(prioclass, priolevel, IOPRIO_HINT_NONE) +#define IOPRIO_PRIO_VALUE_HINT (prioclass, priolevel, priohint) \ + ioprio_value(prioclass, priolevel, priohint)#endif /* _UAPI_LINUX_IOPRIO_H */ Signature · 1 line
2.41.0
Chaitanya Kulkarni
Reviewed-byQuoted 11 lines · Igor Pylypiv
Quoted 10 lines · Damien Le Moal
The use of the "class" argument name in the
ioprio_value()inline function ininclude/uapi/linux/ioprio.hconfuses C++ compilers resulting in compilation errors such as:
/usr/include/linux/ioprio.h:110:43: error: expected primary-expression before ‘int’
110 | static__always_inline__u16ioprio_value(int class, int level, int hint)
| ^~~for user C++ programs including
linux/ioprio.h.
Quoted 9 lines
Quoted 8 lines
Avoid these errors by renaming the arguments of the
ioprio_value()function to prioclass, priolevel and priohint. For consistency, the arguments of theIOPRIO_PRIO_VALUE()andIOPRIO_PRIO_VALUE_HINT()macros are also renamed in the same manner.Reported-by Igor Pylypiv <[email protected]>Fixes 01584c1e2337 ("scsi: block: Improve ioprio value validity checks")Signed-off-by Damien Le Moal <[email protected]>
-ck
Quoted 9 lines · Damien Le Moal
The use of the "class" argument name in the
ioprio_value()inline function ininclude/uapi/linux/ioprio.hconfuses C++ compilers resulting in compilation errors such as:
/usr/include/linux/ioprio.h:110:43: error: expected primary-expression before ‘int’
110 | static__always_inline__u16ioprio_value(int class, int level, int hint)
| ^~~[...]
Applied, thanks!
[1/1] block: uapi: Fix compilation errors using ioprio.h with C++
commit: 8b6e92c358d2e12ff9f12e55bb6101e2ab053ee7
Best regards,
Signature · 1 line
Jens Axboe
Quoted 8 lines · Damien Le Moal
The use of the "class" argument name in the
ioprio_value()inline function ininclude/uapi/linux/ioprio.hconfuses C++ compilers resulting in compilation errors such as:
/usr/include/linux/ioprio.h:110:43: error: expected primary-expression before ‘int’
110 | static__always_inline__u16ioprio_value(int class, int level, int hint)
| ^~~
Quoted 6 lines
for user C++ programs including
linux/ioprio.h.Avoid these errors by renaming the arguments of the
ioprio_value()function to prioclass, priolevel and priohint. For consistency, the arguments of theIOPRIO_PRIO_VALUE()andIOPRIO_PRIO_VALUE_HINT()macros are also renamed in the same manner.