simplify bio_for_each_segment_all
Subsystems (12)
Hi Jens,
this series simplifies bio_for_each_segment_all a bit, as suggested by willy.
PATCH 1/2 bcache: clean up do_btree_node_write a bit
Use a variable containing the buffer address instead of the to be removed integer iterator from bio_for_each_segment_all.
--- drivers/md/bcache/btree.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/md/bcache/btree.c +5 -4
@@ -431,12 +431,13 @@ static void do_btree_node_write(struct btree *b)if (!bch_bio_alloc_pages (b->bio, __GFP_NOWARN|GFP_NOWAIT )) {int j;struct bio_vec *bv; -void *base = (void *) ((unsigned long ) i & ~(PAGE_SIZE -1 )); +void *addr = (void *) ((unsigned long ) i & ~(PAGE_SIZE -1 ));struct bvec_iter_all iter_all; -bio_for_each_segment_all (bv, b->bio, j, iter_all) -memcpy (page_address (bv->bv_page), - base + j *PAGE_SIZE ,PAGE_SIZE ); +bio_for_each_segment_all (bv, b->bio, j, iter_all) { +memcpy (page_address (bv->bv_page), addr,PAGE_SIZE ); + addr +=PAGE_SIZE ; + }bch_submit_bbio (b->bio, b->c, &k.key,0 );
Signature · 1 line
2.20.1
Re: [PATCH 1/2] bcache: clean up do_btree_node_write a bit
Quoted 22 lines · Christoph Hellwig
Use a variable containing the buffer address instead of the to be removed integer iterator from
bio_for_each_segment_all.Suggested-by Matthew Wilcox <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>--- drivers/md/bcache/btree.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/md/bcache/btree.c +1
-1@@ -431,12 +431,13 @@ static void do_btree_node_write(struct btree *b)if (!bch_bio_alloc_pages (b->bio, __GFP_NOWARN|GFP_NOWAIT )) {int j;struct bio_vec *bv; -void *base = (void *) ((unsigned long ) i & ~(PAGE_SIZE -1 )); +void *addr = (void *) ((unsigned long ) i & ~(PAGE_SIZE -1 ));struct bvec_iter_all iter_all;
drivers/md/bcache/btree.c static void do_btree_node_write(struct btree *b) · line 443
Quoted 10 lines
drivers/md/bcache/btree.c +4
-3-bio_for_each_segment_all (bv, b->bio, j, iter_all) -memcpy (page_address (bv->bv_page), - base + j *PAGE_SIZE ,PAGE_SIZE ); +bio_for_each_segment_all (bv, b->bio, j, iter_all) { +memcpy (page_address (bv->bv_page), addr,PAGE_SIZE ); + addr +=PAGE_SIZE ; + }bch_submit_bbio (b->bio, b->c, &k.key,0 );
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
Re: [PATCH 1/2] bcache: clean up do_btree_node_write a bit
In reply to Christoph HellwigQuoted 5 lines · Christoph Hellwig
Use a variable containing the buffer address instead of the to be removed integer iterator from
bio_for_each_segment_all.Suggested-by Matthew Wilcox <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>
Thanks.
Coly Li
Quoted 27 lines
--- drivers/md/bcache/btree.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)drivers/md/bcache/btree.c +5
-4@@ -431,12 +431,13 @@ static void do_btree_node_write(struct btree *b)if (!bch_bio_alloc_pages (b->bio, __GFP_NOWARN|GFP_NOWAIT )) {int j;struct bio_vec *bv; -void *base = (void *) ((unsigned long ) i & ~(PAGE_SIZE -1 )); +void *addr = (void *) ((unsigned long ) i & ~(PAGE_SIZE -1 ));struct bvec_iter_all iter_all; -bio_for_each_segment_all (bv, b->bio, j, iter_all) -memcpy (page_address (bv->bv_page), - base + j *PAGE_SIZE ,PAGE_SIZE ); +bio_for_each_segment_all (bv, b->bio, j, iter_all) { +memcpy (page_address (bv->bv_page), addr,PAGE_SIZE ); + addr +=PAGE_SIZE ; + }bch_submit_bbio (b->bio, b->c, &k.key,0 );
Signature · 1 line
Coly Li
PATCH 2/2 block: remove the i argument to bio_for_each_segment_all
In reply to Christoph HellwigWe only have two callers that need the integer loop iterator, and they can easily maintain it themselves.
--- block/bio.c | 29 ++++++++++------------------- block/bounce.c | 3 +-- drivers/md/bcache/btree.c | 3 +-- drivers/md/dm-crypt.c | 3 +-- drivers/md/raid1.c | 6 +++--- drivers/staging/erofs/data.c | 3 +-- drivers/staging/erofs/unzip_vle.c | 3 +-- fs/block_dev.c | 6 ++---- fs/btrfs/compression.c | 3 +-- fs/btrfs/disk-io.c | 4 ++-- fs/btrfs/extent_io.c | 10 ++++------ fs/btrfs/inode.c | 8 ++++---- fs/btrfs/raid56.c | 3 +-- fs/crypto/bio.c | 3 +-- fs/direct-io.c | 3 +-- fs/ext4/page-io.c | 3 +-- fs/ext4/readpage.c | 3 +-- fs/f2fs/data.c | 9 +++------ fs/gfs2/lops.c | 3 +-- fs/gfs2/meta_io.c | 3 +-- fs/iomap.c | 6 ++- --- fs/mpage.c | 3 +-- fs/xfs/xfs_aops.c | 3 +-- include/linux/bio.h | 5 ++--- 24 files changed, 47 insertions(+), 81 deletions(-)
block/bio.c +10 -19
@@ -874,9 +874,8 @@ static void bio_get_pages(struct bio *bio) {struct bvec_iter_all iter_all;struct bio_vec *bvec; -int i; -bio_for_each_segment_all (bvec, bio, i, iter_all) +bio_for_each_segment_all (bvec, bio, iter_all)get_page (bvec->bv_page); }
@@ -884,9 +883,8 @@ static void bio_release_pages(struct bio *bio) {struct bvec_iter_all iter_all;struct bio_vec *bvec; -int i; -bio_for_each_segment_all (bvec, bio, i, iter_all) +bio_for_each_segment_all (bvec, bio, iter_all)put_page (bvec->bv_page); }
@@ -1166,11 +1164,10 @@ static struct bio_map_data *bio_alloc_map_data(struct iov_iter *data,*/ static int bio_copy_from_iter (struct bio *bio,struct iov_iter *iter) { -int i;struct bio_vec *bvec;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {ssize_t ret; ret = copy_page_from_iter(bvec->bv_page,
@@ -1198,11 +1195,10 @@ static int bio_copy_from_iter(struct bio *bio, struct iov_iter *iter)*/ static int bio_copy_to_iter (struct bio *bio,struct iov_iter iter) { -int i;struct bio_vec *bvec;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {ssize_t ret; ret = copy_page_to_iter(bvec->bv_page,
@@ -1223,10 +1219,9 @@ static int bio_copy_to_iter(struct bio *bio, struct iov_iter iter)void bio_free_pages (struct bio *bio) {struct bio_vec *bvec; -int i;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bvec, bio, i, iter_all) +bio_for_each_segment_all (bvec, bio, iter_all)__free_page (bvec->bv_page); }EXPORT_SYMBOL (bio_free_pages);
@@ -1464,7 +1459,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,return bio; out_unmap: -bio_for_each_segment_all (bvec, bio, j, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {put_page (bvec->bv_page); }bio_put (bio);
@@ -1474,13 +1469,12 @@ struct bio *bio_map_user_iov(struct request_queue *q,static void __bio_unmap_user (struct bio *bio) {struct bio_vec *bvec; -int i;struct bvec_iter_all iter_all;/* * make sure we dirty pages we wrote to */ -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {if (bio_data_dir (bio) ==READ )set_page_dirty_lock (bvec->bv_page);
@@ -1571,10 +1565,9 @@ static void bio_copy_kern_endio_read(struct bio *bio) {char *p = bio->bi_private;struct bio_vec *bvec; -int i;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {memcpy (p,page_address (bvec->bv_page), bvec->bv_len); p += bvec->bv_len; }
@@ -1682,10 +1675,9 @@ struct bio *bio_copy_kern(struct request_queue *q, void *data, unsigned int len,void bio_set_pages_dirty (struct bio *bio) {struct bio_vec *bvec; -int i;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {if (!PageCompound (bvec->bv_page))set_page_dirty_lock (bvec->bv_page); }
@@ -1734,10 +1726,9 @@ void bio_check_pages_dirty(struct bio *bio) {struct bio_vec *bvec;unsigned long flags; -int i;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {if (!PageDirty (bvec->bv_page) && !PageCompound (bvec->bv_page)) goto defer; }
block/bounce.c +1 -2
@@ -163,14 +163,13 @@ static void bounce_end_io(struct bio *bio, mempool_t *pool) {struct bio *bio_orig = bio->bi_private;struct bio_vec *bvec, orig_vec; -int i;struct bvec_iter orig_iter = bio_orig->bi_iter;struct bvec_iter_all iter_all;/* * free up bounce indirect pages used */ -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) { orig_vec =bio_iter_iovec (bio_orig, orig_iter);if (bvec->bv_page != orig_vec.bv_page) {dec_zone_page_state (bvec->bv_page,NR_BOUNCE );
drivers/md/bcache/btree.c +1 -2
@@ -429,12 +429,11 @@ static void do_btree_node_write(struct btree *b) bset_sector_offset(&b->keys, i));if (!bch_bio_alloc_pages (b->bio, __GFP_NOWARN|GFP_NOWAIT )) { -int j;struct bio_vec *bv;void *addr = (void *) ((unsigned long ) i & ~(PAGE_SIZE -1 ));struct bvec_iter_all iter_all; -bio_for_each_segment_all (bv, b->bio, j, iter_all) { +bio_for_each_segment_all (bv, b->bio, iter_all) {memcpy (page_address (bv->bv_page), addr,PAGE_SIZE ); addr +=PAGE_SIZE ; }
drivers/md/dm-crypt.c +1 -2
@@ -1445,11 +1445,10 @@ static struct bio *crypt_alloc_buffer(struct dm_crypt_io *io, unsigned size)static void crypt_free_buffer_pages (struct crypt_config *cc,struct bio *clone) { -unsigned int i;struct bio_vec *bv;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bv, clone, i, iter_all) { +bio_for_each_segment_all (bv, clone, iter_all) {BUG_ON (!bv->bv_page);mempool_free (bv->bv_page, &cc->page_pool); }
drivers/md/raid1.c +3 -3
@@ -2110,7 +2110,7 @@ static void process_checks(struct r1bio *r1_bio) } r1_bio->read_disk = primary;for (i =0 ; i < conf->raid_disks *2 ; i++) { -int j; +int j =0 ;struct bio *pbio = r1_bio->bios[primary];struct bio *sbio = r1_bio->bios[i];blk_status_t status = sbio->bi_status;
@@ -2125,8 +2125,8 @@ static void process_checks(struct r1bio *r1_bio)/* Now we can 'fixup' the error value */ sbio->bi_status =0 ; -bio_for_each_segment_all (bi, sbio, j, iter_all) - page_len[j] = bi->bv_len; +bio_for_each_segment_all (bi, sbio, iter_all) + page_len[j++] = bi->bv_len;if (!status) {for (j = vcnt; j-- ; ) {
drivers/staging/erofs/data.c +1 -2
@@ -17,12 +17,11 @@static inline void read_endio (struct bio *bio) { -int i;struct bio_vec *bvec;const blk_status_t err = bio->bi_status;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {struct page *page = bvec->bv_page;/* page is already locked */
drivers/staging/erofs/unzip_vle.c +1 -2
@@ -844,14 +844,13 @@ static void z_erofs_vle_unzip_kickoff(void *ptr, int bios)static inline void z_erofs_vle_read_endio (struct bio *bio) {const blk_status_t err = bio->bi_status; -unsigned int i;struct bio_vec *bvec;#ifdef EROFS_FS_HAS_MANAGED_CACHE struct address_space *mc =NULL ;#endif struct bvec_iter_all iter_all; -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {struct page *page = bvec->bv_page;bool cachemngd = false;
fs/block_dev.c +2 -4
@@ -210,7 +210,6 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter,struct bio bio;ssize_t ret;blk_qc_t qc; -int i;struct bvec_iter_all iter_all; if ((pos | iov_iter_alignment(iter)) &
@@ -261,7 +260,7 @@ __blkdev_direct_IO_simple(struct kiocb *iocb, struct iov_iter *iter, }__set_current_state (TASK_RUNNING ); -bio_for_each_segment_all (bvec, &bio, i, iter_all) { +bio_for_each_segment_all (bvec, &bio, iter_all) {if (should_dirty && !PageCompound (bvec->bv_page))set_page_dirty_lock (bvec->bv_page);put_page (bvec->bv_page);
@@ -339,9 +338,8 @@ static void blkdev_bio_end_io(struct bio *bio)if (!bio_flagged (bio,BIO_NO_PAGE_REF )) {struct bvec_iter_all iter_all;struct bio_vec *bvec; -int i; -bio_for_each_segment_all (bvec, bio, i, iter_all) +bio_for_each_segment_all (bvec, bio, iter_all)put_page (bvec->bv_page); }bio_put (bio);
fs/btrfs/compression.c +1 -2
@@ -160,7 +160,6 @@ static void end_compressed_bio_read(struct bio *bio)if (cb->errors) {bio_io_error (cb->orig_bio); }else { -int i;struct bio_vec *bvec;struct bvec_iter_all iter_all;
@@ -169,7 +168,7 @@ static void end_compressed_bio_read(struct bio *bio)* checked so the end_io handlers know about it */ ASSERT (!bio_flagged (bio,BIO_CLONED )); -bio_for_each_segment_all (bvec, cb->orig_bio, i, iter_all) +bio_for_each_segment_all (bvec, cb->orig_bio, iter_all)SetPageChecked (bvec->bv_page);bio_endio (cb->orig_bio);
fs/btrfs/disk-io.c +2 -2
@@ -832,11 +832,11 @@ static blk_status_t btree_csum_one_bio(struct bio *bio) {struct bio_vec *bvec;struct btrfs_root *root; -int i, ret =0 ; +int ret =0 ;struct bvec_iter_all iter_all;ASSERT (!bio_flagged (bio,BIO_CLONED )); -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) { root =BTRFS_I (bvec->bv_page->mapping->host)->root; ret =csum_dirty_buffer (root->fs_info, bvec->bv_page);if (ret)
fs/btrfs/extent_io.c +4 -6
@@ -2451,11 +2451,10 @@ static void end_bio_extent_writepage(struct bio *bio)struct bio_vec *bvec;u64 start;u64 end; -int i;struct bvec_iter_all iter_all;ASSERT (!bio_flagged (bio,BIO_CLONED )); -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {struct page *page = bvec->bv_page;struct inode *inode = page->mapping->host;struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);
@@ -2523,11 +2522,10 @@ static void end_bio_extent_readpage(struct bio *bio)u64 extent_len =0 ;int mirror;int ret; -int i;struct bvec_iter_all iter_all;ASSERT (!bio_flagged (bio,BIO_CLONED )); -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {struct page *page = bvec->bv_page;struct inode *inode = page->mapping->host;struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);
@@ -3643,11 +3641,11 @@ static void end_bio_extent_buffer_writepage(struct bio *bio) {struct bio_vec *bvec;struct extent_buffer *eb; -int i, done; +int done;struct bvec_iter_all iter_all;ASSERT (!bio_flagged (bio,BIO_CLONED )); -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {struct page *page = bvec->bv_page; eb = (struct extent_buffer *)page->private;
fs/btrfs/inode.c +4 -4
@@ -7828,7 +7828,6 @@ static void btrfs_retry_endio_nocsum(struct bio *bio)struct inode *inode = done->inode;struct bio_vec *bvec;struct extent_io_tree *io_tree, *failure_tree; -int i;struct bvec_iter_all iter_all;if (bio->bi_status)
@@ -7841,7 +7840,7 @@ static void btrfs_retry_endio_nocsum(struct bio *bio) done->uptodate =1 ;ASSERT (!bio_flagged (bio,BIO_CLONED )); -bio_for_each_segment_all (bvec, bio, i, iter_all) +bio_for_each_segment_all (bvec, bio, iter_all)clean_io_failure (BTRFS_I (inode)->root->fs_info, failure_tree, io_tree, done->start, bvec->bv_page,btrfs_ino (BTRFS_I (inode)),0 );
@@ -7919,7 +7918,7 @@ static void btrfs_retry_endio(struct bio *bio)struct bio_vec *bvec;int uptodate;int ret; -int i; +int i =0 ;struct bvec_iter_all iter_all;if (bio->bi_status)
@@ -7934,7 +7933,7 @@ static void btrfs_retry_endio(struct bio *bio) failure_tree = &BTRFS_I (inode)->io_failure_tree;ASSERT (!bio_flagged (bio,BIO_CLONED )); -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) { ret =__readpage_endio_check (inode, io_bio, i, bvec->bv_page, bvec->bv_offset, done->start, bvec->bv_len);
@@ -7946,6 +7945,7 @@ static void btrfs_retry_endio(struct bio *bio) bvec->bv_offset); else uptodate =0 ; + i++; } done->uptodate = uptodate;
fs/btrfs/raid56.c +1 -2
@@ -1442,12 +1442,11 @@ static int fail_bio_stripe(struct btrfs_raid_bio *rbio,static void set_bio_pages_uptodate (struct bio *bio) {struct bio_vec *bvec; -int i;struct bvec_iter_all iter_all;ASSERT (!bio_flagged (bio,BIO_CLONED )); -bio_for_each_segment_all (bvec, bio, i, iter_all) +bio_for_each_segment_all (bvec, bio, iter_all)SetPageUptodate (bvec->bv_page); }
fs/crypto/bio.c +1 -2
@@ -29,10 +29,9 @@static void __fscrypt_decrypt_bio (struct bio *bio,bool done) {struct bio_vec *bv; -int i;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bv, bio, i, iter_all) { +bio_for_each_segment_all (bv, bio, iter_all) {struct page *page = bv->bv_page;int ret =fscrypt_decrypt_page (page->mapping->host, page,PAGE_SIZE ,0 , page->index);
fs/direct-io.c +1 -2
@@ -538,7 +538,6 @@ static struct bio *dio_await_one(struct dio *dio)static blk_status_t dio_bio_complete (struct dio *dio,struct bio *bio) {struct bio_vec *bvec; -unsigned i;blk_status_t err = bio->bi_status;if (err) {
@@ -553,7 +552,7 @@ static blk_status_t dio_bio_complete(struct dio *dio, struct bio *bio) }else {struct bvec_iter_all iter_all; -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {struct page *page = bvec->bv_page; if (dio->op == REQ_OP_READ && !PageCompound(page) &&
fs/ext4/page-io.c +1 -2
@@ -61,11 +61,10 @@ static void buffer_io_error(struct buffer_head *bh)static void ext4_finish_bio (struct bio *bio) { -int i;struct bio_vec *bvec;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {struct page *page = bvec->bv_page;#ifdef CONFIG_FS_ENCRYPTION struct page *data_page =NULL ;
fs/ext4/readpage.c +1 -2
@@ -71,7 +71,6 @@ static inline bool ext4_bio_encrypted(struct bio *bio)static void mpage_end_io (struct bio *bio) {struct bio_vec *bv; -int i;struct bvec_iter_all iter_all;if (ext4_bio_encrypted (bio)) {
@@ -82,7 +81,7 @@ static void mpage_end_io(struct bio *bio)return ; } } -bio_for_each_segment_all (bv, bio, i, iter_all) { +bio_for_each_segment_all (bv, bio, iter_all) {struct page *page = bv->bv_page;if (!bio->bi_status) {
fs/f2fs/data.c +3 -6
@@ -86,10 +86,9 @@ static void __read_end_io(struct bio *bio) {struct page *page;struct bio_vec *bv; -int i;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bv, bio, i, iter_all) { +bio_for_each_segment_all (bv, bio, iter_all) { page = bv->bv_page;/* PG_error was set if any post_read step failed */
@@ -164,7 +163,6 @@ static void f2fs_write_end_io(struct bio *bio) {struct f2fs_sb_info *sbi = bio->bi_private;struct bio_vec *bvec; -int i;struct bvec_iter_all iter_all;if (time_to_inject (sbi,FAULT_WRITE_IO )) {
@@ -172,7 +170,7 @@ static void f2fs_write_end_io(struct bio *bio) bio->bi_status =BLK_STS_IOERR ; } -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {struct page *page = bvec->bv_page;enum count_type type =WB_DATA_TYPE (page);
@@ -349,7 +347,6 @@ static bool __has_merged_page(struct f2fs_bio_info *io, struct inode *inode, {struct bio_vec *bvec;struct page *target; -int i;struct bvec_iter_all iter_all;if (!io->bio)
@@ -358,7 +355,7 @@ static bool __has_merged_page(struct f2fs_bio_info *io, struct inode *inode,if (!inode && !page && !ino)return true; -bio_for_each_segment_all (bvec, io->bio, i, iter_all) { +bio_for_each_segment_all (bvec, io->bio, iter_all) {if (bvec->bv_page->mapping) target = bvec->bv_page;
fs/gfs2/lops.c +1 -2
@@ -207,7 +207,6 @@ static void gfs2_end_log_write(struct bio *bio)struct gfs2_sbd *sdp = bio->bi_private;struct bio_vec *bvec;struct page *page; -int i;struct bvec_iter_all iter_all;if (bio->bi_status) {
@@ -216,7 +215,7 @@ static void gfs2_end_log_write(struct bio *bio)wake_up (&sdp->sd_logd_waitq); } -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) { page = bvec->bv_page;if (page_has_buffers (page))gfs2_end_log_write_bh (sdp, bvec, bio->bi_status);
fs/gfs2/meta_io.c +1 -2
@@ -189,10 +189,9 @@ struct buffer_head *gfs2_meta_new(struct gfs2_glock *gl, u64 blkno)static void gfs2_meta_read_endio (struct bio *bio) {struct bio_vec *bvec; -int i;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bvec, bio, i, iter_all) { +bio_for_each_segment_all (bvec, bio, iter_all) {struct page *page = bvec->bv_page;struct buffer_head *bh =page_buffers (page);unsigned int len = bvec->bv_len;
fs/iomap.c +2 -4
@@ -273,10 +273,9 @@ iomap_read_end_io(struct bio *bio) {int error =blk_status_to_errno (bio->bi_status);struct bio_vec *bvec; -int i;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bvec, bio, i, iter_all) +bio_for_each_segment_all (bvec, bio, iter_all)iomap_read_page_end_io (bvec, error);bio_put (bio); }
@@ -1592,9 +1591,8 @@ static void iomap_dio_bio_end_io(struct bio *bio)if (!bio_flagged (bio,BIO_NO_PAGE_REF )) {struct bvec_iter_all iter_all;struct bio_vec *bvec; -int i; -bio_for_each_segment_all (bvec, bio, i, iter_all) +bio_for_each_segment_all (bvec, bio, iter_all)put_page (bvec->bv_page); }bio_put (bio);
fs/mpage.c +1 -2
@@ -47,10 +47,9 @@static void mpage_end_io (struct bio *bio) {struct bio_vec *bv; -int i;struct bvec_iter_all iter_all; -bio_for_each_segment_all (bv, bio, i, iter_all) { +bio_for_each_segment_all (bv, bio, iter_all) {struct page *page = bv->bv_page;page_endio (page,bio_op (bio),blk_status_to_errno (bio->bi_status));
fs/xfs/xfs_aops.c +1 -2
@@ -98,7 +98,6 @@ xfs_destroy_ioend(for (bio = &ioend->io_inline_bio; bio; bio = next) {struct bio_vec *bvec; -int i;struct bvec_iter_all iter_all;/*
@@ -111,7 +110,7 @@ xfs_destroy_ioend( next = bio->bi_private;/* walk each page on bio, ending page IO on them */ -bio_for_each_segment_all (bvec, bio, i, iter_all) +bio_for_each_segment_all (bvec, bio, iter_all)xfs_finish_page_writeback (inode, bvec, error);bio_put (bio); }
include/linux/bio.h +2 -3
@@ -134,9 +134,8 @@ static inline bool bio_next_segment(const struct bio *bio,* drivers should _never_ use the all version - the bio may have been split * before it got to the driver and the driver won't own all of it */ -#define bio_for_each_segment_all (bvl, bio, i, iter) \ - for (i = 0, bvl = bvec_init_iter_all(&iter); \ - bio_next_segment((bio), &iter); i++) +#define bio_for_each_segment_all (bvl, bio, iter) \ + for (bvl = bvec_init_iter_all(&iter); bio_next_segment((bio), &iter); )static inline void bio_advance_iter (struct bio *bio,struct bvec_iter *iter,unsigned bytes)
Signature · 1 line
2.20.1
Re: [PATCH 2/2] block: remove the i argument to bio_for_each_segment_all
Quoted 7 lines · Christoph Hellwig
We only have two callers that need the integer loop iterator, and they can easily maintain it themselves.
Suggested-by Matthew Wilcox <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Johannes Thumshirn <[email protected]>---
For the btrfs bits
Quoted 5 lines
fs/btrfs/compression.c | 3 +-- fs/btrfs/disk-io.c | 4 ++-- fs/btrfs/extent_io.c | 10 ++++------ fs/btrfs/inode.c | 8 ++++---- fs/btrfs/raid56.c | 3 +--
Re: [PATCH 2/2] block: remove the i argument to bio_for_each_segment_all
In reply to Christoph HellwigQuoted 24 lines · Christoph Hellwig
We only have two callers that need the integer loop iterator, and they can easily maintain it themselves.
Suggested-by Matthew Wilcox <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Johannes Thumshirn <[email protected]>--- block/bio.c | 29 ++++++++++------------------- block/bounce.c | 3 +-- drivers/md/bcache/btree.c | 3 +-- drivers/md/dm-crypt.c | 3 +-- drivers/md/raid1.c | 6 +++--- drivers/staging/erofs/data.c | 3 +-- drivers/staging/erofs/unzip_vle.c | 3 +-- fs/block_dev.c | 6 ++---- fs/btrfs/compression.c | 3 +-- fs/btrfs/disk-io.c | 4 ++-- fs/btrfs/extent_io.c | 10 ++++------ fs/btrfs/inode.c | 8 ++++---- fs/btrfs/raid56.c | 3 +-- fs/crypto/bio.c | 3 +-- fs/direct-io.c | 3 +-- fs/ext4/page-io.c | 3 +-- fs/ext4/readpage.c | 3 +--
Quoted 9 lines
fs/f2fs/data.c | 9 +++------ fs/gfs2/lops.c | 3 +-- fs/gfs2/meta_io.c | 3 +-- fs/iomap.c | 6 ++- --- fs/mpage.c | 3 +-- fs/xfs/xfs_aops.c | 3 +-- include/linux/bio.h | 5 ++--- 24 files changed, 47 insertions(+), 81 deletions(-)
Cheers,
Hannes
Signature · 5 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 21284 (AG Nürnberg)
Re: [PATCH 2/2] block: remove the i argument to bio_for_each_segment_all
In reply to Christoph HellwigQuoted 10 lines · Christoph Hellwig
We only have two callers that need the integer loop iterator, and they can easily maintain it themselves.
Suggested-by Matthew Wilcox <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Johannes Thumshirn <[email protected]>--- block/bio.c | 29 ++++++++++------------------- block/bounce.c | 3 +-- drivers/md/bcache/btree.c | 3 +--
For the bcache part,
Thanks.
Signature · 1 line
Coly Li
ping?
Quoted 4 lines · Christoph Hellwig
Hi Jens,
this series simplifies
bio_for_each_segment_alla bit, as suggested by willy.
---end quoted text---
Matthew Wilcox
Reviewed-byQuoted 8 lines · Christoph Hellwig
ping?
Quoted 4 lines · Christoph Hellwig
Hi Jens,
this series simplifies
bio_for_each_segment_alla bit, as suggested by willy.---end quoted text---
If Reviewed-by dominates Suggested-by, then
Quoted 4 lines · Christoph Hellwig
Hi Jens,
this series simplifies
bio_for_each_segment_alla bit, as suggested by willy.
Applied, thanks.
Signature · 1 line
Jens Axboe