Skip to contentSkip to conversation

block: move initialization of i to its definition

PATCH New Tom Rix 1 participant 1 message Jul 12, 2022 Block layer

lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 block: move initialization of i to its definition

clang build fails with
block/bio.c:1232:6: error: variable 'i' is used uninitialized whenever 'if' condition is true [-Werror,-Wsometimes-uninitialized]

        if (unlikely(!size)) {

In this check, the code jumps to 'end:' over the loop that initializes 'i'. Move the initialization of i to its definition.

Fixes 9a6469060316 ("block: convert to advancing variants of iov_iter_get_pages{,_alloc}()")
---
 block/bio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
block/bio.c +2 -2
index a98b90489ae0..aff36ca7cabb 100644
@@ -1199,7 +1199,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
 	struct bio_vec *bv = bio->bi_io_vec + bio->bi_vcnt;
 	struct page **pages = (struct page **)bv;
 	ssize_t size, left;
-	unsigned len, i;
+	unsigned len, i = 0;
 	size_t offset, trim;
 	int ret = 0;
 
@@ -1234,7 +1234,7 @@ static int __bio_iov_iter_get_pages(struct bio *bio, struct iov_iter *iter)
 		goto out;
 	}
 
-	for (left = size, i = 0; left > 0; left -= len, i++) {
+	for (left = size; left > 0; left -= len, i++) {
 		struct page *page = pages[i];
 
 		len = min_t(size_t, PAGE_SIZE - offset, left);
Signature · 1 line
2.27.0