[PATCH v3 43/49] f2fs: convert to bio_for_each_segment_all_sp()
From: Ming Lei <hidden>
Date: 2017-08-08 08:45:42
Also in:
linux-f2fs-devel, linux-fsdevel, linux-mm, lkml
Subsystem:
f2fs file system, filesystems (vfs and infrastructure), the rest · Maintainers:
Jaegeuk Kim, Chao Yu, Alexander Viro, Christian Brauner, Linus Torvalds
Cc: Jaegeuk Kim <jaegeuk@kernel.org> Cc: Chao Yu <redacted> Cc: linux-f2fs-devel@lists.sourceforge.net Signed-off-by: Ming Lei <redacted> --- fs/f2fs/data.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 99fa8e9780e8..69aa500834d3 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c@@ -54,6 +54,7 @@ static void f2fs_read_end_io(struct bio *bio) { struct bio_vec *bvec; int i; + struct bvec_iter_all bia; #ifdef CONFIG_F2FS_FAULT_INJECTION /*
@@ -75,7 +76,7 @@ static void f2fs_read_end_io(struct bio *bio) } } - bio_for_each_segment_all(bvec, bio, i) { + bio_for_each_segment_all_sp(bvec, bio, i, bia) { struct page *page = bvec->bv_page; if (!bio->bi_status) {
@@ -95,8 +96,9 @@ 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 bia; - bio_for_each_segment_all(bvec, bio, i) { + bio_for_each_segment_all_sp(bvec, bio, i, bia) { struct page *page = bvec->bv_page; enum count_type type = WB_DATA_TYPE(page);
@@ -256,6 +258,7 @@ static bool __has_merged_page(struct f2fs_bio_info *io, struct bio_vec *bvec; struct page *target; int i; + struct bvec_iter_all bia; if (!io->bio) return false;
@@ -263,7 +266,7 @@ static bool __has_merged_page(struct f2fs_bio_info *io, if (!inode && !ino) return true; - bio_for_each_segment_all(bvec, io->bio, i) { + bio_for_each_segment_all_sp(bvec, io->bio, i, bia) { if (bvec->bv_page->mapping) target = bvec->bv_page;
--
2.9.4