[PATCH] block: Remove unnecessary unlikely()

Matthew Wilcox (Oracle)
2024-01-19T16:34:40Z

Jens added unlikely() thinking that this was an error path. It's
actually just the end of the iteration, so does not warrant an
unlikely().

Fixes: 7bed6f3d08b7 ("block: Fix iterating over an empty bio with bio_for_each_folio_all")
Cc: stable@vger.kernel.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
include/linux/bio.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 875d792bffff..1518f1201ddd 100644
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -286,7 +286,7 @@ static inline void bio_first_folio(struct folio_iter *fi, struct bio *bio,
{
struct bio_vec *bvec = bio_first_bvec_all(bio) + i;

- if (unlikely(i >= bio->bi_vcnt)) {
+ if (i >= bio->bi_vcnt) {
fi->folio = NULL;
return;
}
--
2.43.0