Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933402AbcL0QMg (ORCPT ); Tue, 27 Dec 2016 11:12:36 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:33089 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932937AbcL0QGb (ORCPT ); Tue, 27 Dec 2016 11:06:31 -0500 From: Ming Lei To: Jens Axboe , linux-kernel@vger.kernel.org Cc: linux-block@vger.kernel.org, Christoph Hellwig , Ming Lei , Steven Whitehouse , Bob Peterson , cluster-devel@redhat.com (open list:GFS2 FILE SYSTEM) Subject: [PATCH v1 43/54] gfs2: convert to bio_for_each_segment_all_sp() Date: Wed, 28 Dec 2016 00:04:52 +0800 Message-Id: <1482854706-14128-12-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482854706-14128-1-git-send-email-tom.leiming@gmail.com> References: <1482854706-14128-1-git-send-email-tom.leiming@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1269 Lines: 43 Signed-off-by: Ming Lei --- fs/gfs2/lops.c | 3 ++- fs/gfs2/meta_io.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c index b1f9144b42c7..ddbd1f772cdb 100644 --- a/fs/gfs2/lops.c +++ b/fs/gfs2/lops.c @@ -208,13 +208,14 @@ 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_error) { sdp->sd_log_error = bio->bi_error; fs_err(sdp, "Error %d writing to log\n", bio->bi_error); } - bio_for_each_segment_all(bvec, bio, i) { + bio_for_each_segment_all_sp(bvec, bio, i, bia) { page = bvec->bv_page; if (page_has_buffers(page)) gfs2_end_log_write_bh(sdp, bvec, bio->bi_error); diff --git a/fs/gfs2/meta_io.c b/fs/gfs2/meta_io.c index 49db8ef13fdf..317cc8ed74ce 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_segment_all(bvec, bio, i) { + bio_for_each_segment_all_sp(bvec, bio, i, bia) { struct page *page = bvec->bv_page; struct buffer_head *bh = page_buffers(page); unsigned int len = bvec->bv_len; -- 2.7.4