All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ming Lei <ming.lei@redhat.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, Ming Lei <ming.lei@redhat.com>
Subject: [PATCH V5 27/33] gfs2: conver to bio_for_each_page_all2
Date: Thu, 24 May 2018 17:01:32 +0800	[thread overview]
Message-ID: <20180524090139.2150-28-ming.lei@redhat.com> (raw)
In-Reply-To: <20180524090139.2150-1-ming.lei@redhat.com>

bio_for_each_page_all() can't be used any more after multipage bvec is
enabled, so we have to convert to bio_for_each_page_all2().

Given bvec can't be changed inside bio_for_each_page_all2(), this patch
marks the bvec parameter as 'const' for gfs2_end_log_write_bh().

Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
 fs/gfs2/lops.c    | 6 ++++--
 fs/gfs2/meta_io.c | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index a31b9b028957..0284cd66089c 100644
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -168,7 +168,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,
+				  const struct bio_vec *bvec,
 				  blk_status_t error)
 {
 	struct buffer_head *bh, *next;
@@ -207,6 +208,7 @@ static void gfs2_end_log_write(struct bio *bio)
 	struct bio_vec *bvec;
 	struct page *page;
 	int i;
+	struct bvec_iter_all bia;
 
 	if (bio->bi_status) {
 		fs_err(sdp, "Error %d writing to journal, jid=%u\n",
@@ -214,7 +216,7 @@ static void gfs2_end_log_write(struct bio *bio)
 		wake_up(&sdp->sd_logd_waitq);
 	}
 
-	bio_for_each_page_all(bvec, bio, i) {
+	bio_for_each_page_all2(bvec, bio, i, bia) {
 		page = bvec->bv_page;
 		if (page_has_buffers(page))
 			gfs2_end_log_write_bh(sdp, bvec, bio->bi_status);
diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c
index 1d720352310a..a945c9fa1dc6 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 bia;
 
-	bio_for_each_page_all(bvec, bio, i) {
+	bio_for_each_page_all2(bvec, bio, i, bia) {
 		struct page *page = bvec->bv_page;
 		struct buffer_head *bh = page_buffers(page);
 		unsigned int len = bvec->bv_len;
-- 
2.9.5

  parent reply	other threads:[~2018-05-24  9:01 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-24  9:01 [PATCH V5 00/33] block: support multipage bvec Ming Lei
2018-05-24  9:01 ` [PATCH V5 01/33] block: rename bio_for_each_segment* with bio_for_each_page* Ming Lei
2018-05-24  9:01 ` [PATCH V5 02/33] block: rename rq_for_each_segment as rq_for_each_page Ming Lei
2018-05-24  9:01 ` [PATCH V5 03/33] block: rename bio_segments() with bio_pages() Ming Lei
2018-05-24  9:01 ` [PATCH V5 04/33] block: introduce multipage page bvec helpers Ming Lei
2018-05-24  9:01 ` [PATCH V5 05/33] block: introduce bio_for_each_segment() Ming Lei
2018-05-24  9:01 ` [PATCH V5 06/33] block: use bio_for_each_segment() to compute segments count Ming Lei
2018-05-24  9:01 ` [PATCH V5 07/33] block: use bio_for_each_segment() to map sg Ming Lei
2018-05-24  9:01 ` [PATCH V5 08/33] block: introduce segment_last_page() Ming Lei
2018-05-24  9:01 ` [PATCH V5 09/33] fs/buffer.c: use bvec iterator to truncate the bio Ming Lei
2018-05-24  9:01 ` [PATCH V5 10/33] btrfs: use segment_last_page to get bio's last page Ming Lei
2018-05-24 21:44   ` David Sterba
2018-05-25  0:07     ` Ming Lei
2018-05-24  9:01 ` [PATCH V5 11/33] block: implement bio_pages_all() via bio_for_each_page_all() Ming Lei
2018-05-24  9:01 ` [PATCH V5 12/33] block: introduce bio_segments() Ming Lei
2018-05-24  9:01 ` [PATCH V5 13/33] block: introduce rq_for_each_segment() Ming Lei
2018-05-24  9:01 ` [PATCH V5 14/33] block: loop: pass segments to iov_iter Ming Lei
2018-05-24  9:01 ` [PATCH V5 15/33] block: introduce bio_clone_seg_bioset() Ming Lei
2018-05-24  9:01 ` [PATCH V5 16/33] dm: clone bio via bio_clone_seg_bioset Ming Lei
2018-05-24  9:01 ` [PATCH V5 17/33] block: bio: introduce bio_for_each_page_all2 and bio_for_each_segment_all Ming Lei
2018-05-24  9:01 ` [PATCH V5 18/33] block: deal with dirtying pages for multipage bvec Ming Lei
2018-05-24  9:01 ` [PATCH V5 19/33] block: convert to bio_for_each_page_all2() Ming Lei
2018-05-24  9:01 ` [PATCH V5 20/33] md/dm/bcache: conver to bio_for_each_page_all2 and bio_for_each_segment Ming Lei
2018-05-24  9:01 ` [PATCH V5 21/33] fs: conver to bio_for_each_page_all2 Ming Lei
2018-05-24  9:01 ` [PATCH V5 22/33] btrfs: " Ming Lei
2018-05-24  9:01 ` [PATCH V5 23/33] ext4: " Ming Lei
2018-05-24  9:01 ` [PATCH V5 24/33] f2fs: " Ming Lei
2018-05-24  9:01 ` [PATCH V5 25/33] xfs: " Ming Lei
2018-05-24  9:01 ` [PATCH V5 26/33] exofs: " Ming Lei
2018-05-24  9:01 ` Ming Lei [this message]
2018-05-24  9:01 ` [PATCH V5 28/33] block: kill bio_for_each_page_all() Ming Lei
2018-05-24  9:01 ` [PATCH V5 29/33] block: rename bio_for_each_page_all2 as bio_for_each_page_all Ming Lei
2018-05-24  9:01 ` [PATCH V5 30/33] block: enable multipage bvecs Ming Lei
2018-05-24  9:01 ` [PATCH V5 31/33] block: bio: pass segments to bio if bio_add_page() is bypassed Ming Lei
2018-05-24  9:01 ` [PATCH V5 32/33] block: always define BIO_MAX_PAGES as 256 Ming Lei
2018-05-24  9:01 ` [PATCH V5 33/33] block: document usage of bio iterator helpers Ming Lei

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180524090139.2150-28-ming.lei@redhat.com \
    --to=ming.lei@redhat.com \
    --cc=axboe@kernel.dk \
    --cc=linux-block@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.