[PATCH v3 40/49] ext4: convert to bio_for_each_segment_all_sp()

[Ming Lei]

Cc: "Theodore Ts'o" <ty...@mit.edu>
Cc: Andreas Dilger <adilger.ker...@dilger.ca>
Cc: linux-e...@vger.kernel.org
Signed-off-by: Ming Lei <ming....@redhat.com>
---
 fs/ext4/page-io.c  | 3 ++-
 fs/ext4/readpage.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index c2fce4478cca..5a36ad110f14 100644
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -62,8 +62,9 @@ static void ext4_finish_bio(struct bio *bio)
 {
        int i;
        struct bio_vec *bvec;
+       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;
 #ifdef CONFIG_EXT4_FS_ENCRYPTION
                struct page *data_page = NULL;
diff --git a/fs/ext4/readpage.c b/fs/ext4/readpage.c
index 40a5497b0f60..6bd33c4c1f7f 100644
--- a/fs/ext4/readpage.c
+++ b/fs/ext4/readpage.c
@@ -71,6 +71,7 @@ static void mpage_end_io(struct bio *bio)
 {
        struct bio_vec *bv;
        int i;
+       struct bvec_iter_all bia;
 
        if (ext4_bio_encrypted(bio)) {
                if (bio->bi_status) {
@@ -80,7 +81,7 @@ static void mpage_end_io(struct bio *bio)
                        return;
                }
        }
-       bio_for_each_segment_all(bv, bio, i) {
+       bio_for_each_segment_all_sp(bv, bio, i, bia) {
                struct page *page = bv->bv_page;
 
                if (!bio->bi_status) {
-- 
2.9.4