From be3bacececd7c4ab233105171d39082858de1baa Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <arnd@arndb.de>

Date: Sun, 11 Apr 2021 21:43:13 +0800

Subject: [PATCH] md: bcache: avoid -Wempty-body warnings

Git-commit: be3bacececd7c4ab233105171d39082858de1baa

Patch-mainline: v5.13-rc1

References: bsc#1187357

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.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Signed-off-by: Coly Li <colyli@suse.de>

Link: https://lore.kernel.org/r/20210411134316.80274-5-colyli@suse.de

Signed-off-by: Jens Axboe <axboe@kernel.dk>

---

 drivers/md/bcache/util.h | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h

index c029f7443190..bca4a7c97da7 100644

--- a/drivers/md/bcache/util.h

+++ b/drivers/md/bcache/util.h

@@ -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)

-- 

2.26.2