From: Coly Li <colyli@suse.de>
To: axboe@kernel.dk
Cc: linux-bcache@vger.kernel.org, linux-block@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>, Coly Li <colyli@suse.de>
Subject: [PATCH 4/7] md: bcache: avoid -Wempty-body warnings
Date: Sun, 11 Apr 2021 21:43:13 +0800 [thread overview]
Message-ID: <20210411134316.80274-5-colyli@suse.de> (raw)
In-Reply-To: <20210411134316.80274-1-colyli@suse.de>
From: Arnd Bergmann <arnd@arndb.de>
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>
---
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
next prev parent reply other threads:[~2021-04-11 13:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-11 13:43 [PATCH 0/7] bcache patches for Linux 5.13 -- 1st wave Coly Li
2021-04-11 13:43 ` [PATCH 1/7] bcache: reduce redundant code in bch_cached_dev_run() Coly Li
2021-04-11 13:43 ` [PATCH 2/7] bcache: remove PTR_CACHE Coly Li
2021-04-11 13:43 ` [PATCH 3/7] bcache: use NULL instead of using plain integer as pointer Coly Li
2021-04-11 13:43 ` Coly Li [this message]
2021-04-11 13:43 ` [PATCH 5/7] md: bcache: Trivial typo fixes in the file journal.c Coly Li
2021-04-11 13:43 ` [PATCH 6/7] bcache: Use 64-bit arithmetic instead of 32-bit Coly Li
2021-04-11 13:43 ` [PATCH 7/7] bcache: fix a regression of code compiling failure in debug.c Coly Li
2021-04-12 9:06 ` Christoph Hellwig
2021-04-12 9:53 ` Coly Li
2021-04-12 12:50 ` Jens Axboe
2021-04-12 13:13 ` Coly Li
2021-04-11 14:40 ` [PATCH 0/7] bcache patches for Linux 5.13 -- 1st wave Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210411134316.80274-5-colyli@suse.de \
--to=colyli@suse.de \
--cc=arnd@arndb.de \
--cc=axboe@kernel.dk \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--subject='Re: [PATCH 4/7] md: bcache: avoid -Wempty-body warnings' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).