block: allow bio_for_each_segment_all() to iterate over multi-page bvec

This patch introduces one extra iterator variable to bio_for_each_segment_all(),
then we can allow bio_for_each_segment_all() to iterate over multi-page bvec.

Given it is just one mechannical & simple change on all bio_for_each_segment_all()
users, this patch does tree-wide change in one single patch, so that we can
avoid to use a temporary helper for this conversion.

Reviewed-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

2 files changed, 8 insertions, 4 deletions

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 94dcab655bc0..15deefeaafd0 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -170,7 +170,8 @@ u64 gfs2_log_bmap(struct gfs2_sbd *sdp)
  * that is pinned in the pagecache.
  */
 
-static void gfs2_end_log_write_bh(struct gfs2_sbd *sdp, struct bio_vec *bvec,
+static void gfs2_end_log_write_bh(struct gfs2_sbd *sdp,
+                                  struct bio_vec *bvec,
                                   blk_status_t error)
 {
         struct buffer_head *bh, *next;
@@ -208,6 +209,7 @@ static void gfs2_end_log_write(struct bio *bio)
         struct bio_vec *bvec;
         struct page *page;
         int i;
+        struct bvec_iter_all iter_all;
 
         if (bio->bi_status) {
                 fs_err(sdp, "Error %d writing to journal, jid=%u\n",
@@ -215,7 +217,7 @@ static void gfs2_end_log_write(struct bio *bio)
                 wake_up(&sdp->sd_logd_waitq);
         }
 
-        bio_for_each_segment_all(bvec, bio, i) {
+        bio_for_each_segment_all(bvec, bio, i, iter_all) {
                 page = bvec->bv_page;
                 if (page_has_buffers(page))
                         gfs2_end_log_write_bh(sdp, bvec, bio->bi_status);
@@ -388,8 +390,9 @@ static void gfs2_end_log_read(struct bio *bio)
         struct page *page;
         struct bio_vec *bvec;
         int i;
+        struct bvec_iter_all iter_all;
 
-        bio_for_each_segment_all(bvec, bio, i) {
+        bio_for_each_segment_all(bvec, bio, i, iter_all) {
                 page = bvec->bv_page;
                 if (bio->bi_status) {
                         int err = blk_status_to_errno(bio->bi_status);
diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index be9c0bf697fe..3201342404a7 100644
--- a/fs/gfs2/meta_io.c
+++ b/fs/gfs2/meta_io.c
@@ -190,8 +190,9 @@ 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) {
+        bio_for_each_segment_all(bvec, bio, i, iter_all) {
                 struct page *page = bvec->bv_page;
                 struct buffer_head *bh = page_buffers(page);
                 unsigned int len = bvec->bv_len;