jbd2: avoid -Wempty-body warnings
PATCH 1/1 jbd2: avoid -Wempty-body warnings
From: Arnd Bergmann <[email protected]>
Building with 'make W=1' shows a harmless -Wempty-body warning:
fs/jbd2/recovery.c: In function 'fc_do_one_pass':fs/jbd2/recovery.c:267:75: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
267 | jbd_debug(3, "Fast commit replay failed, err = %d\n", err);
| ^
Change the empty dprintk() macros to no_printk(), which avoids this warning and adds format string checking.
--- include/linux/jbd2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/jbd2.h +1 -1
@@ -61,7 +61,7 @@ void __jbd2_debug(int level, const char *file, const char *func, #define jbd_debug(n, fmt, a...) \ __jbd2_debug((n), __FILE__, __func__, __LINE__, (fmt), ##a)#else -#define jbd_debug(n, fmt, a...) /**/ +#define jbd_debug(n, fmt, a...) no_printk(fmt, ##a)#endif extern void *jbd2_alloc (size_t size,gfp_t flags);
Signature · 1 line
2.29.2
Quoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Building with 'make W=1' shows a harmless -Wempty-body warning:
fs/jbd2/recovery.c: In function 'fc_do_one_pass':fs/jbd2/recovery.c:267:75: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
267 |jbd_debug(3, "Fast commit replay failed, err = %d\n", err);
| ^
Quoted 4 lines
Change the empty
dprintk()macros tono_printk(), which avoids this warning and adds format string checking.Signed-off-by Arnd Bergmann <[email protected]>
Sure. Feel free to add:
Honza
Quoted 20 lines
--- include/linux/jbd2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/jbd2.h +1
-1@@ -61,7 +61,7 @@ void __jbd2_debug(int level, const char *file, const char *func, #define jbd_debug(n, fmt, a...) \ __jbd2_debug((n), __FILE__, __func__, __LINE__, (fmt), ##a)#else -#define jbd_debug(n, fmt, a...) /**/ +#define jbd_debug(n, fmt, a...) no_printk(fmt, ##a)#endif extern void *jbd2_alloc (size_t size,gfp_t flags);Signature · 1 line
2.29.2
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 10 lines · Jan Kara
Quoted 9 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
Building with 'make W=1' shows a harmless -Wempty-body warning:
fs/jbd2/recovery.c: In function 'fc_do_one_pass':fs/jbd2/recovery.c:267:75: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
267 |jbd_debug(3, "Fast commit replay failed, err = %d\n", err);
| ^
Quoted 8 lines
Quoted 4 lines
Change the empty
dprintk()macros tono_printk(), which avoids this warning and adds format string checking.Signed-off-by Arnd Bergmann <[email protected]>Sure. Feel free to add:
Reviewed-by Jan Kara <[email protected]>
Applied, thanks.
- Ted