Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

spl: cmn_err_once() should be usable in brace-less if else statements 

Commit 11913870 (#14567) added cmn_err_once() by #define'ing a
compound statement but failed to consider usage in a single
statement brace-less if else.

Fix the problem by using the common "do {} while (0)" construct.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Attila Fülöp <attila@fueloep.org>
Closes #14629
This commit is contained in:
Attila Fülöp 2023-03-15 19:13:25 +01:00 committed by GitHub
parent c31bb934cd
commit 5f3611121d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/os/freebsd/spl/sys/cmn_err.h
View File

@ -75,36 +75,36 @@ extern void panic(const char *, ...)
__attribute__((format(printf, 1, 2), __noreturn__)); __attribute__((format(printf, 1, 2), __noreturn__));
#define cmn_err_once(ce, ...) \ #define cmn_err_once(ce, ...) \
{ \ do { \
static volatile uint32_t printed = 0; \ static volatile uint32_t printed = 0; \
if (atomic_cas_32(&printed, 0, 1) == 0) { \ if (atomic_cas_32(&printed, 0, 1) == 0) { \
cmn_err(ce, __VA_ARGS__); \ cmn_err(ce, __VA_ARGS__); \
} \ } \
} } while (0)
#define vcmn_err_once(ce, fmt, ap) \ #define vcmn_err_once(ce, fmt, ap) \
{ \ do { \
static volatile uint32_t printed = 0; \ static volatile uint32_t printed = 0; \
if (atomic_cas_32(&printed, 0, 1) == 0) { \ if (atomic_cas_32(&printed, 0, 1) == 0) { \
vcmn_err(ce, fmt, ap); \ vcmn_err(ce, fmt, ap); \
} \ } \
} } while (0)
#define zcmn_err_once(zone, ce, ...) \ #define zcmn_err_once(zone, ce, ...) \
{ \ do { \
static volatile uint32_t printed = 0; \ static volatile uint32_t printed = 0; \
if (atomic_cas_32(&printed, 0, 1) == 0) { \ if (atomic_cas_32(&printed, 0, 1) == 0) { \
zcmn_err(zone, ce, __VA_ARGS__); \ zcmn_err(zone, ce, __VA_ARGS__); \
} \ } \
} } while (0)
#define vzcmn_err_once(zone, ce, fmt, ap) \ #define vzcmn_err_once(zone, ce, fmt, ap) \
{ \ do { \
static volatile uint32_t printed = 0; \ static volatile uint32_t printed = 0; \
if (atomic_cas_32(&printed, 0, 1) == 0) { \ if (atomic_cas_32(&printed, 0, 1) == 0) { \
vzcmn_err(zone, ce, fmt, ap); \ vzcmn_err(zone, ce, fmt, ap); \
} \ } \
} } while (0)
#endif /* !_ASM */ #endif /* !_ASM */

8
include/os/linux/spl/sys/cmn_err.h
View File

@ -47,19 +47,19 @@ extern void vpanic(const char *, va_list)
#define fm_panic panic #define fm_panic panic
#define cmn_err_once(ce, ...) \ #define cmn_err_once(ce, ...) \
{ \ do { \
static volatile uint32_t printed = 0; \ static volatile uint32_t printed = 0; \
if (atomic_cas_32(&printed, 0, 1) == 0) { \ if (atomic_cas_32(&printed, 0, 1) == 0) { \
cmn_err(ce, __VA_ARGS__); \ cmn_err(ce, __VA_ARGS__); \
} \ } \
} } while (0)
#define vcmn_err_once(ce, fmt, ap) \ #define vcmn_err_once(ce, fmt, ap) \
{ \ do { \
static volatile uint32_t printed = 0; \ static volatile uint32_t printed = 0; \
if (atomic_cas_32(&printed, 0, 1) == 0) { \ if (atomic_cas_32(&printed, 0, 1) == 0) { \
vcmn_err(ce, fmt, ap); \ vcmn_err(ce, fmt, ap); \
} \ } \
} } while (0)
#endif /* SPL_CMN_ERR_H */ #endif /* SPL_CMN_ERR_H */

16
lib/libspl/include/sys/cmn_err.h
View File

@ -30,35 +30,35 @@
#include <atomic.h> #include <atomic.h>
#define cmn_err_once(ce, ...) \ #define cmn_err_once(ce, ...) \
{ \ do { \
static volatile uint32_t printed = 0; \ static volatile uint32_t printed = 0; \
if (atomic_cas_32(&printed, 0, 1) == 0) { \ if (atomic_cas_32(&printed, 0, 1) == 0) { \
cmn_err(ce, __VA_ARGS__); \ cmn_err(ce, __VA_ARGS__); \
} \ } \
} } while (0)
#define vcmn_err_once(ce, fmt, ap) \ #define vcmn_err_once(ce, fmt, ap) \
{ \ do { \
static volatile uint32_t printed = 0; \ static volatile uint32_t printed = 0; \
if (atomic_cas_32(&printed, 0, 1) == 0) { \ if (atomic_cas_32(&printed, 0, 1) == 0) { \
vcmn_err(ce, fmt, ap); \ vcmn_err(ce, fmt, ap); \
} \ } \
} } while (0)
#define zcmn_err_once(zone, ce, ...) \ #define zcmn_err_once(zone, ce, ...) \
{ \ do { \
static volatile uint32_t printed = 0; \ static volatile uint32_t printed = 0; \
if (atomic_cas_32(&printed, 0, 1) == 0) { \ if (atomic_cas_32(&printed, 0, 1) == 0) { \
zcmn_err(zone, ce, __VA_ARGS__); \ zcmn_err(zone, ce, __VA_ARGS__); \
} \ } \
} } while (0)
#define vzcmn_err_once(zone, ce, fmt, ap) \ #define vzcmn_err_once(zone, ce, fmt, ap) \
{ \ do { \
static volatile uint32_t printed = 0; \ static volatile uint32_t printed = 0; \
if (atomic_cas_32(&printed, 0, 1) == 0) { \ if (atomic_cas_32(&printed, 0, 1) == 0) { \
vzcmn_err(zone, ce, fmt, ap); \ vzcmn_err(zone, ce, fmt, ap); \
} \ } \
} } while (0)
#endif #endif