Skip to contentSkip to conversation

md: bcache: avoid -Wempty-body warnings

PATCH New Arnd Bergmann 1 participant 1 message Mar 22, 2021 bcache (block layer cache)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 md: bcache: avoid -Wempty-body warnings

From: Arnd Bergmann <[email protected]>

building with 'make W=1' shows a harmless warning for each user of the EBUG_ON() macro:

drivers/md/bcache/bset.c: In function 'bch_btree_sort_partial':
drivers/md/bcache/util.h:30:55: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
30 | #define EBUG_ON(cond) do { if (cond); } while (0)
| ^
drivers/md/bcache/bset.c:1312:9: note: in expansion of macro 'EBUG_ON'

 1312 |         EBUG_ON(oldsize >= 0 && bch_count_data(b) != oldsize);
      |         ^~~~~~~

Reword the macro slightly to avoid the warning.

---
 drivers/md/bcache/util.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/bcache/util.h +1 -1
index c029f7443190..bca4a7c97da7 100644
@@ -27,7 +27,7 @@ struct closure;
 
 #else /* DEBUG */
 
-#define EBUG_ON(cond)			do { if (cond); } while (0)
+#define EBUG_ON(cond)		do { if (cond) do {} while (0); } while (0)
 #define atomic_dec_bug(v)	atomic_dec(v)
 #define atomic_inc_bug(v, i)	atomic_inc(v)
 
Signature · 1 line
2.29.2