* [PATCH] md: remove unnecessary unlikely()
@ 2019-03-27 6:31 zhengbin
2019-03-27 13:19 ` Mike Snitzer
0 siblings, 1 reply; 2+ messages in thread
From: zhengbin @ 2019-03-27 6:31 UTC (permalink / raw)
To: agk, snitzer, dm-devel; +Cc: zhengbin13, yi.zhang, houtao1
BUG_ON() already contains an unlikely(), there is no need for another one.
Signed-off-by: zhengbin <zhengbin13@huawei.com>
---
drivers/md/dm-integrity.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
index d57d997..7f03638 100644
--- a/drivers/md/dm-integrity.c
+++ b/drivers/md/dm-integrity.c
@@ -1959,7 +1959,7 @@ 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))) {
@@ -1974,7 +1974,7 @@ 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.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: md: remove unnecessary unlikely()
2019-03-27 6:31 [PATCH] md: remove unnecessary unlikely() zhengbin
@ 2019-03-27 13:19 ` Mike Snitzer
0 siblings, 0 replies; 2+ messages in thread
From: Mike Snitzer @ 2019-03-27 13:19 UTC (permalink / raw)
To: zhengbin, Mikulas Patocka; +Cc: dm-devel, houtao1, agk, yi.zhang
On Wed, Mar 27 2019 at 2:31am -0400,
zhengbin <zhengbin13@huawei.com> wrote:
> BUG_ON() already contains an unlikely(), there is no need for another one.
>
> Signed-off-by: zhengbin <zhengbin13@huawei.com>
> ---
> drivers/md/dm-integrity.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c
> index d57d997..7f03638 100644
> --- a/drivers/md/dm-integrity.c
> +++ b/drivers/md/dm-integrity.c
> @@ -1959,7 +1959,7 @@ 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))) {
> @@ -1974,7 +1974,7 @@ 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.7.4
Last time another janitor came through with this suggestion Mikulas
responded with:
https://www.redhat.com/archives/dm-devel/2018-September/msg00088.html
SO thanks, but no thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-27 13:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-27 6:31 [PATCH] md: remove unnecessary unlikely() zhengbin
2019-03-27 13:19 ` Mike Snitzer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.