From: Mike Snitzer <snitzer@kernel.org>
Date: Fri, 25 Mar 2022 21:20:45 +0000 (-0400)
Subject: dm: mark various branches unlikely
X-Git-Tag: v6.6.17~7373^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe221db4192cf6c5f6b0be59e09025b05418e226;p=platform%2Fkernel%2Flinux-rpi.git

dm: mark various branches unlikely

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
---

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index e6b6fe0..34d457c 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);