Only need to convert the bio_for_each_segment_all() call into
__bio_for_each_segment() call and using btrfs_bio::iter as the initial
iterator.
Signed-off-by: Qu Wenruo <wqu@xxxxxxxx>
---
fs/btrfs/extent_io.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 524a00ba0ca0..8f5a1059a296 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4495,20 +4495,20 @@ static struct extent_buffer *find_extent_buffer_nolock(
static void end_bio_subpage_eb_writepage(struct bio *bio)
{
struct btrfs_fs_info *fs_info;
- struct bio_vec *bvec;
- struct bvec_iter_all iter_all;
+ struct bvec_iter iter;
+ struct bio_vec bvec;
fs_info = btrfs_sb(bio_first_page_all(bio)->mapping->host->i_sb);
ASSERT(fs_info->sectorsize < PAGE_SIZE);
- ASSERT(!bio_flagged(bio, BIO_CLONED));
- bio_for_each_segment_all(bvec, bio, iter_all) {
- struct page *page = bvec->bv_page;
- u64 bvec_start = page_offset(page) + bvec->bv_offset;
- u64 bvec_end = bvec_start + bvec->bv_len - 1;
+ ASSERT(btrfs_bio(bio)->iter.bi_size);
+ __bio_for_each_segment(bvec, bio, iter, btrfs_bio(bio)->iter) {
+ struct page *page = bvec.bv_page;
+ u64 bvec_start = page_offset(page) + bvec.bv_offset;
+ u64 bvec_end = bvec_start + bvec.bv_len - 1;
u64 cur_bytenr = bvec_start;
- ASSERT(IS_ALIGNED(bvec->bv_len, fs_info->nodesize));
+ ASSERT(IS_ALIGNED(bvec.bv_len, fs_info->nodesize));
/* Iterate through all extent buffers in the range */
while (cur_bytenr <= bvec_end) {
@@ -4551,14 +4551,14 @@ static void end_bio_subpage_eb_writepage(struct bio *bio)
static void end_bio_extent_buffer_writepage(struct bio *bio)
{
- struct bio_vec *bvec;
struct extent_buffer *eb;
+ struct bvec_iter iter;
+ struct bio_vec bvec;
int done;
- struct bvec_iter_all iter_all;
- ASSERT(!bio_flagged(bio, BIO_CLONED));
- bio_for_each_segment_all(bvec, bio, iter_all) {
- struct page *page = bvec->bv_page;
+ ASSERT(btrfs_bio(bio)->iter.bi_size);
+ __bio_for_each_segment(bvec, bio, iter, btrfs_bio(bio)->iter) {
+ struct page *page = bvec.bv_page;
eb = (struct extent_buffer *)page->private;
BUG_ON(!eb);
--
2.34.1
--
dm-devel mailing list
dm-devel@xxxxxxxxxx
https://listman.redhat.com/mailman/listinfo/dm-devel
