From: Nicholas Mc Guire <hofrat@osadl.org>
To: Alasdair Kergon <agk@redhat.com>
Cc: Mike Snitzer <snitzer@redhat.com>,
dm-devel@redhat.com, linux-kernel@vger.kernel.org,
Nicholas Mc Guire <hofrat@osadl.org>
Subject: [PATCH] dm integrity: drop excess unlikely() from BUG_ON()
Date: Fri, 14 Sep 2018 09:37:03 +0200 [thread overview]
Message-ID: <1536910623-18013-1-git-send-email-hofrat@osadl.org> (raw)
include/asm-generic/bug.h defines BUG_ON(condition) as
do { if (unlikely(condition)) BUG(); } while (0).
So BUG_ON already provides unlikely() on the condition thus
there is no point in having BUG_ON(unlikely(condition)),
thus simply drop the excess unlikely().
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
---
Found during code review
Patch was compile tested with: x86_64_defconfig + SCSI_LOWLEVEL=y,
DM_INTEGRITY=y
(with warnings from sparse and smatch - not related to the proposed
change though)
Patch is against 4.19-rc3 (localversion-next is next-20180913)
drivers/md/dm-integrity.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index 89ccb64..8574e73 100644
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -1948,7 +1948,8 @@ static void do_journal_write(struct dm_integrity_c *ic, unsigned write_start,
if (journal_entry_is_unused(je))
continue;
- BUG_ON(unlikely(journal_entry_is_inprogress(je)) && !from_replay);
+ BUG_ON(journal_entry_is_inprogress(je) &&
+ !from_replay);
sec = journal_entry_get_sector(je);
if (unlikely(from_replay)) {
if (unlikely(sec & (unsigned)(ic->sectors_per_block - 1))) {
@@ -1963,7 +1964,8 @@ static void do_journal_write(struct dm_integrity_c *ic, unsigned write_start,
sector_t sec2, area2, offset2;
if (journal_entry_is_unused(je2))
break;
- BUG_ON(unlikely(journal_entry_is_inprogress(je2)) && !from_replay);
+ BUG_ON(journal_entry_is_inprogress(je2) &&
+ !from_replay);
sec2 = journal_entry_get_sector(je2);
get_area_and_offset(ic, sec2, &area2, &offset2);
if (area2 != area || offset2 != offset + ((k - j) << ic->sb->log2_sectors_per_block))
--
2.1.4
reply other threads:[~2018-09-14 7:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1536910623-18013-1-git-send-email-hofrat@osadl.org \
--to=hofrat@osadl.org \
--cc=agk@redhat.com \
--cc=dm-devel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=snitzer@redhat.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).