From patchwork Fri May 25 03:46:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10426129 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 561CE602D8 for ; Fri, 25 May 2018 03:51:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4622E295A6 for ; Fri, 25 May 2018 03:51:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A7B5295B3; Fri, 25 May 2018 03:51:51 +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 C2C0A295A6 for ; Fri, 25 May 2018 03:51:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D82CE6B02C0; Thu, 24 May 2018 23:51:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D0C446B02C2; Thu, 24 May 2018 23:51:49 -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 BFCD26B02C3; Thu, 24 May 2018 23:51:49 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-qt0-f200.google.com (mail-qt0-f200.google.com [209.85.216.200]) by kanga.kvack.org (Postfix) with ESMTP id 92FC96B02C0 for ; Thu, 24 May 2018 23:51:49 -0400 (EDT) Received: by mail-qt0-f200.google.com with SMTP id z10-v6so2832315qto.11 for ; Thu, 24 May 2018 20:51:49 -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=gJMcYRCsJGGsehW9UMNjARP3BoelWj5cBxE7br/26Zs=; b=uH5OBuwv6Db/UMhMtLwBJa8wqqCP/CN6L8FQQpNU3TDj0InK/7rIF6mvgj1dFNqI8u FBktgJmdPxv0xCKZkYKuk3vbYZX3jdXVtwAZh8wUgInKstugVQXiZ3uM6fmK/XPzDILP PhC9tCphaO8ZuuUnwoePLaS4f93sE65mcy1L5HQRAHhsGQwyUl2istmKXRbtsGyVM7af XiJz0/bsM5HvhYQeKT05olhDqFMPgmCvSe2Jd5fqoKsCY3KTrkRrxH7kbE613IRtKFGK Fayez/kbH0+AjbQ2zy/Hpm+dhuvR3bCKUufOu1xW6a3zhpGvvGMwlUFYD0w8P/ltp4/P /AOw== 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: ALKqPwfa787TQqvGUIYLKBx0wb2dM3JRULPbhrb+RJJP3mZ+fH4AwjEF 9Er+bWYvEVyN9XiAIHlfuAMNzHCjG40Hc+sMBEwjdDgm+6GMsN0SZ+YMMfdTkKhKBX8oNNufGMo IP/dVg/sWAiASV5WGUxRPWNYGgicQguMV4cpFfzhX/yDcivJA3UhdinUFlXjrzoLawQ== X-Received: by 2002:a37:bd81:: with SMTP id n123-v6mr597998qkf.14.1527220309400; Thu, 24 May 2018 20:51:49 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIERcpSMvUtREuJkkZeRJY6aKb/fn8ON+SfcwP7vklD5jUQK/bmEowCAzpZWjNO6ZBIjvXC X-Received: by 2002:a37:bd81:: with SMTP id n123-v6mr597978qkf.14.1527220308774; Thu, 24 May 2018 20:51:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527220308; cv=none; d=google.com; s=arc-20160816; b=SmQw7dC58sYrR9Tsiey0N7Ow8Fw1DGMVvHrkrFBEV5AQbEjEjox+jRz/sMDPCO9Km6 /H5H0WYI2TNQUFt+1Oe9/r9hYSxCqmJA8B9zDawUenZoLHz8/QiUwbqMmwCQnTF7Y8Op dDlBR/wQpWvFQsKEHe5/Ktvgs/2ubrPNGW/AcCLxdbG2XWBesod1h2d7Hh3pbblR60KC VTfA6EKHKzKRMg6VurMi0R5aupOYZtLdErD5RrC4j/0HQaZnRjkmS02Ro0FCirruLMyc 3X9MithZAZ4a9CNP/OeVsoUSbKPk/T7Tr0utSpehZm8UvHt2cGLnXg4kSNYF40VH5dYb iepw== 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=gJMcYRCsJGGsehW9UMNjARP3BoelWj5cBxE7br/26Zs=; b=yTos4Lm+3hxrXyZnAwvmgJpI4YN5sofFc67xaLDIUl/b6Aa5Hn7BHuXmpBu78iV6CV ALx1556Qowuc6fc9I2WJVBM8wdHJyA2BVAvDUoTERdoMg3iIBQWGf714vO6hB2Lh8hQk UIj+oqvYpPanKemBnWqqBp/sXjEuWyHDG+PwGLeS4/qDw48bNoDbPWcg3pDyi6ymyMz0 1+Lg9rmaVo0saUYpFBX0hl4Ah4shWZvel1VVoS8dnpN6ck/ZOhsy1BJNWUDVQ/X5CwjW Z0wcn7dDbtn9fxae2I8EKSi2oGUOykhX1wiBUGguQfha5UwDxvvQEuxZUrJGorTgPX6t jWcQ== 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 37-v6si12463896qvj.156.2018.05.24.20.51.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 May 2018 20:51:48 -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-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6B9FEBB426; Fri, 25 May 2018 03:51:48 +0000 (UTC) Received: from localhost (ovpn-12-30.pek2.redhat.com [10.72.12.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82F7B200BCBB; Fri, 25 May 2018 03:51:40 +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 , Ming Lei Subject: [RESEND PATCH V5 27/33] gfs2: conver to bio_for_each_page_all2 Date: Fri, 25 May 2018 11:46:15 +0800 Message-Id: <20180525034621.31147-28-ming.lei@redhat.com> In-Reply-To: <20180525034621.31147-1-ming.lei@redhat.com> References: <20180525034621.31147-1-ming.lei@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 25 May 2018 03:51:48 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Fri, 25 May 2018 03:51:48 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.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_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 --- 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;