From patchwork Sat Jun 9 12:30:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10455633 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 16B30601F7 for ; Sat, 9 Jun 2018 12:35:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 086171FF83 for ; Sat, 9 Jun 2018 12:35:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F0E66223A6; Sat, 9 Jun 2018 12:35:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A8921FF83 for ; Sat, 9 Jun 2018 12:35:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D2606B0294; Sat, 9 Jun 2018 08:35:27 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 880C46B0296; Sat, 9 Jun 2018 08:35:27 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7973B6B0297; Sat, 9 Jun 2018 08:35:27 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qk0-f197.google.com (mail-qk0-f197.google.com [209.85.220.197]) by kanga.kvack.org (Postfix) with ESMTP id 4F8D26B0294 for ; Sat, 9 Jun 2018 08:35:27 -0400 (EDT) Received: by mail-qk0-f197.google.com with SMTP id u127-v6so15541700qka.9 for ; Sat, 09 Jun 2018 05:35:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=Q3VbhF7tGaGA8Cv4JCfHfV84pUsARONgGya4YqfMWxY=; b=p+MvBUOlcw/rqPvVFSfC8EC5ceGExYM3v9OhW75qInvc2gJhQLK+ivZeusoankgwvF ajit+GcN5hO+F821GDRjhcrx0V5MjLmzPaviI6XThIiEl0fxSwi00GA5veSFBiN+vBgq 7GnwiNrPwkp2tI4MTfGtCkKmUUHhTP2dZs69oAHEwZTKMYd9b3Z/7gnM11Wm4I9GMPXQ HcEtDEa6LBEfRBLFdLqP2ifGYNdJm1qvzoG4rifUqf6UvREvPT5pE2ZCkcvhEXgdlorC UWE53oOUEoJ6FMb/UfsP0iHl/73c+UZ6nMpCDBuuw/+JTXPohhg5E/YOXTdw50dIAE4d /iWg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com X-Gm-Message-State: APt69E2rPyJX0VpLDeUfWkZB9QilpWpnGd40cU6w1AFGWsyoeAunxCcQ xkhHGZExz+4Iuciy7m436QpboRTXabW7lMril/zu8R/Mp2oKlWlHKJoRKeU5KjLXhJe8IpRCq3z q+Qwvq/4s4ZtxhpGHPxBI8kSQsGgW2Wb5YAsxwkargXsURZzz0bQ3zMoP3+pwo3wGZg== X-Received: by 2002:ac8:5398:: with SMTP id x24-v6mr8967262qtp.81.1528547727138; Sat, 09 Jun 2018 05:35:27 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIPU1bDM0GDPw1fv2fzxm935I4rhmTIcMzSbt3cPzZ3a9Ms17e0NgCBkFrhbtCJuzTp+PPM X-Received: by 2002:ac8:5398:: with SMTP id x24-v6mr8967239qtp.81.1528547726581; Sat, 09 Jun 2018 05:35:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528547726; cv=none; d=google.com; s=arc-20160816; b=z5anSPLXv0VRrYccWdkmECn9ETxY3KTEySI/3hP+8OdHIwVBrJ3nFh2ugbD2dHhsw+ eEuEspgRAlHCLn1jHpSjOoyQSnuND9FlA3OCIE4EsC4zhHb8hPCl1kNLByrE8gIfJOTL l5ODq0GjhnbHiwCB2kZ/T2vGm2xpuZW1+8P5g7WejeeFAi36JP3ZYZZ/ZRB0YIWEJGL7 FUbmrEBBQXneiyu+IOUkNCoYB+/aCumoemJ6vdB12hfZOjSkcvHyTsEIMvoXB/BmEJDW GSkgX4X/LDacXRL0xXBvF5uAFIlfzh1NkoLxz/59vJIkRjVBNyfiNrQ2aMSp11v6NKmo 2Cng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=Q3VbhF7tGaGA8Cv4JCfHfV84pUsARONgGya4YqfMWxY=; b=rt27MNqF69QHMaVhXzCYwQhnKCL1wrqP/YwHck7y83daeaeOB+umLvXeaoGgA6BT+6 0GxeeY8NgSJDyTysJxtuVpdn89uQGhhW7+EBADe+L+eI2kJCLNLn05aHIbnuHF8OMh15 pJCp4tgdAHCg4PbduYbCXR5wpUGiw6LD8IGiZGGH0d2myKqPxNWH1otvWWpaD+XJD9xI uBL5gz8KHQh8fqvOAMIJAPGJUCRFK8Ehch7OFQEaKBLVlUKAv1KFJmdAbLu6VxzYevur v29AwQAK7TbegK0Y1Kpsyp38+GV4vaZJ8hFGZqwX7WJ+CXf8Eg/touqlAobH7T5naj97 GxcA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from mx1.redhat.com (mx3-rdu2.redhat.com. [66.187.233.73]) by mx.google.com with ESMTPS id d43-v6si2353156qta.247.2018.06.09.05.35.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Jun 2018 05:35:26 -0700 (PDT) Received-SPF: pass (google.com: domain of ming.lei@redhat.com designates 66.187.233.73 as permitted sender) client-ip=66.187.233.73; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ming.lei@redhat.com designates 66.187.233.73 as permitted sender) smtp.mailfrom=ming.lei@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2EDE8406E8CB; Sat, 9 Jun 2018 12:35:26 +0000 (UTC) Received: from localhost (ovpn-12-40.pek2.redhat.com [10.72.12.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25BBE1002950; Sat, 9 Jun 2018 12:35:16 +0000 (UTC) From: Ming Lei To: Jens Axboe , Christoph Hellwig , Alexander Viro , Kent Overstreet Cc: David Sterba , Huang Ying , linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Theodore Ts'o , "Darrick J . Wong" , Coly Li , Filipe Manana , Randy Dunlap , Ming Lei Subject: [PATCH V6 26/30] gfs2: conver to bio_for_each_chunk_segment_all Date: Sat, 9 Jun 2018 20:30:10 +0800 Message-Id: <20180609123014.8861-27-ming.lei@redhat.com> In-Reply-To: <20180609123014.8861-1-ming.lei@redhat.com> References: <20180609123014.8861-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Sat, 09 Jun 2018 12:35:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Sat, 09 Jun 2018 12:35:26 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'ming.lei@redhat.com' RCPT:'' X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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_chunk_segment_all() Given bvec can't be changed inside bio_for_each_chunk_segtment(), this patch marks the bvec parameter as 'const' for gfs2_end_log_write_bh(). Signed-off-by: Ming Lei --- 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 4d6567990baf..e48f215006dd 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_chunk_iter citer; 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_segment_all(bvec, bio, i) { + bio_for_each_chunk_segment_all(bvec, bio, i, citer) { 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 52de1036d9f9..1448f42f9c91 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_chunk_iter citer; - bio_for_each_segment_all(bvec, bio, i) { + bio_for_each_chunk_segment_all(bvec, bio, i, citer) { struct page *page = bvec->bv_page; struct buffer_head *bh = page_buffers(page); unsigned int len = bvec->bv_len;