From fe221db4192cf6c5f6b0be59e09025b05418e226 Mon Sep 17 00:00:00 2001
From: Mike Snitzer <snitzer@kernel.org>
Date: Fri, 25 Mar 2022 17:20:45 -0400
Subject: [PATCH] dm: mark various branches unlikely
Git-commit: fe221db4192cf6c5f6b0be59e09025b05418e226
Patch-mainline: v5.19-rc1
References: jsc#PED-2765
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Coly Li <colyli@suse.de>
---
drivers/md/dm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index e6b6fe03dbcf..34d457cfcb36 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -991,7 +991,7 @@ static void clone_endio(struct bio *bio)
disable_write_zeroes(md);
}
- if (blk_queue_is_zoned(q))
+ if (unlikely(blk_queue_is_zoned(q)))
dm_zone_endio(io, bio);
if (endio) {
@@ -1288,7 +1288,7 @@ static void __map_bio(struct bio *clone)
* on zoned target. In this case, dm_zone_map_bio() calls the target
* map operation.
*/
- if (dm_emulate_zone_append(io->md))
+ if (unlikely(dm_emulate_zone_append(io->md)))
r = dm_zone_map_bio(tio);
else
r = ti->type->map(ti, clone);
@@ -1631,7 +1631,7 @@ static void dm_submit_bio(struct bio *bio)
* Use blk_queue_split() for abnormal IO (e.g. discard, writesame, etc)
* otherwise associated queue_limits won't be imposed.
*/
- if (is_abnormal_io(bio))
+ if (unlikely(is_abnormal_io(bio)))
blk_queue_split(&bio);
dm_split_and_process_bio(md, map, bio);
--
2.35.3