Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

block: Convert some code to bio_for_each_segment_all()

More prep work for immutable bvecs:

A few places in the code were either open coding or using the wrong
version - fix.

After we introduce the bvec iter, it'll no longer be possible to modify
the biovec through bio_for_each_segment_all() - it doesn't increment a
pointer to the current bvec, you pass in a struct bio_vec (not a
pointer) which is updated with what the current biovec would be (taking
into account bi_bvec_done and bi_size).

So because of that it's more worthwhile to be consistent about
bio_for_each_segment()/bio_for_each_segment_all() usage.

Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
CC: NeilBrown <neilb@suse.de>
CC: Alasdair Kergon <agk@redhat.com>
CC: dm-devel@redhat.com
CC: Alexander Viro <viro@zeniv.linux.org.uk>

+19 -24
+1 -2
drivers/md/dm-crypt.c
··· 858 858 unsigned int i; 859 859 struct bio_vec *bv; 860 860 861 - for (i = 0; i < clone->bi_vcnt; i++) { 862 - bv = bio_iovec_idx(clone, i); 861 + bio_for_each_segment_all(bv, clone, i) { 863 862 BUG_ON(!bv->bv_page); 864 863 mempool_free(bv->bv_page, cc->page_pool); 865 864 bv->bv_page = NULL;
+3 -7
drivers/md/raid1.c
··· 925 925 if (unlikely(!bvecs)) 926 926 return; 927 927 928 - bio_for_each_segment(bvec, bio, i) { 928 + bio_for_each_segment_all(bvec, bio, i) { 929 929 bvecs[i] = *bvec; 930 930 bvecs[i].bv_page = alloc_page(GFP_NOIO); 931 931 if (unlikely(!bvecs[i].bv_page)) ··· 1284 1284 struct bio_vec *bvec; 1285 1285 int j; 1286 1286 1287 - /* Yes, I really want the '__' version so that 1288 - * we clear any unused pointer in the io_vec, rather 1289 - * than leave them unchanged. This is important 1290 - * because when we come to free the pages, we won't 1291 - * know the original bi_idx, so we just free 1292 - * them all 1287 + /* 1288 + * We trimmed the bio, so _all is legit 1293 1289 */ 1294 1290 bio_for_each_segment_all(bvec, mbio, j) 1295 1291 bvec->bv_page = r1_bio->behind_bvecs[j].bv_page;
+10 -10
fs/bio.c
··· 1548 1548 */ 1549 1549 void bio_set_pages_dirty(struct bio *bio) 1550 1550 { 1551 - struct bio_vec *bvec = bio->bi_io_vec; 1551 + struct bio_vec *bvec; 1552 1552 int i; 1553 1553 1554 - for (i = 0; i < bio->bi_vcnt; i++) { 1555 - struct page *page = bvec[i].bv_page; 1554 + bio_for_each_segment_all(bvec, bio, i) { 1555 + struct page *page = bvec->bv_page; 1556 1556 1557 1557 if (page && !PageCompound(page)) 1558 1558 set_page_dirty_lock(page); ··· 1561 1561 1562 1562 static void bio_release_pages(struct bio *bio) 1563 1563 { 1564 - struct bio_vec *bvec = bio->bi_io_vec; 1564 + struct bio_vec *bvec; 1565 1565 int i; 1566 1566 1567 - for (i = 0; i < bio->bi_vcnt; i++) { 1568 - struct page *page = bvec[i].bv_page; 1567 + bio_for_each_segment_all(bvec, bio, i) { 1568 + struct page *page = bvec->bv_page; 1569 1569 1570 1570 if (page) 1571 1571 put_page(page); ··· 1614 1614 1615 1615 void bio_check_pages_dirty(struct bio *bio) 1616 1616 { 1617 - struct bio_vec *bvec = bio->bi_io_vec; 1617 + struct bio_vec *bvec; 1618 1618 int nr_clean_pages = 0; 1619 1619 int i; 1620 1620 1621 - for (i = 0; i < bio->bi_vcnt; i++) { 1622 - struct page *page = bvec[i].bv_page; 1621 + bio_for_each_segment_all(bvec, bio, i) { 1622 + struct page *page = bvec->bv_page; 1623 1623 1624 1624 if (PageDirty(page) || PageCompound(page)) { 1625 1625 page_cache_release(page); 1626 - bvec[i].bv_page = NULL; 1626 + bvec->bv_page = NULL; 1627 1627 } else { 1628 1628 nr_clean_pages++; 1629 1629 }
+4 -4
fs/direct-io.c
··· 441 441 static int dio_bio_complete(struct dio *dio, struct bio *bio) 442 442 { 443 443 const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); 444 - struct bio_vec *bvec = bio->bi_io_vec; 445 - int page_no; 444 + struct bio_vec *bvec; 445 + unsigned i; 446 446 447 447 if (!uptodate) 448 448 dio->io_error = -EIO; ··· 450 450 if (dio->is_async && dio->rw == READ) { 451 451 bio_check_pages_dirty(bio); /* transfers ownership */ 452 452 } else { 453 - for (page_no = 0; page_no < bio->bi_vcnt; page_no++) { 454 - struct page *page = bvec[page_no].bv_page; 453 + bio_for_each_segment_all(bvec, bio, i) { 454 + struct page *page = bvec->bv_page; 455 455 456 456 if (dio->rw == READ && !PageCompound(page)) 457 457 set_page_dirty_lock(page);
+1 -1
mm/bounce.c
··· 231 231 bounce: 232 232 bio = bio_clone_bioset(*bio_orig, GFP_NOIO, fs_bio_set); 233 233 234 - bio_for_each_segment(to, bio, i) { 234 + bio_for_each_segment_all(to, bio, i) { 235 235 struct page *page = to->bv_page; 236 236 237 237 if (page_to_pfn(page) <= queue_bounce_pfn(q) && !force)