From patchwork Sat Jun 9 12:30:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 10455629 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 D6A9E601F7 for ; Sat, 9 Jun 2018 12:35:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C79381FF83 for ; Sat, 9 Jun 2018 12:35:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBDEF223A6; Sat, 9 Jun 2018 12:35:17 +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 1D8331FF83 for ; Sat, 9 Jun 2018 12:35:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1CD526B0292; Sat, 9 Jun 2018 08:35:16 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 17B946B0294; Sat, 9 Jun 2018 08:35:16 -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 092C96B0295; Sat, 9 Jun 2018 08:35:16 -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 D28406B0292 for ; Sat, 9 Jun 2018 08:35:15 -0400 (EDT) Received: by mail-qt0-f200.google.com with SMTP id d7-v6so13277308qth.21 for ; Sat, 09 Jun 2018 05:35:15 -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=I/RCnTTvJ5+fBvJ2GgPwKpieLv29HGy7FgsIlHR8Bo0=; b=dMY04Yuk0qJPxBhUdVlk8q6jyWiR0TuEMSbWBxD0/ef4y5b00/luOROx4Ub/Jd6Zkg XcWS+6Sw7DGd5L/b78wejnIcoD+QfsIOyaPtMhg8FDVIeVbs5pjQeQsH1tb/sgvjtkEm H30xsLdc/cnS5NNtmZs8xmzh3Dfnpo2LwX1aX1EXXXhBI1y53fAf7tWQ+CpF9UxpOg1F KamxrzpH9Rj2jrt4R1tPJGprFQgCMNJuC4Nb2IYPsD/FgEP1ckO/oHZpUQQ/t6dUAwuS 7CHkKOtZOvW86KGjbzqeDfZ2V0mBOnmVIuwHn9eLV4SzJbZ+/BaGcg0U2URJpaG+oXaV cVXg== 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: APt69E1FI0pm1xL2Xm8Y8fSFRFLNZR9ye+9/G19lyRzeMECb5LYjfWsu olV9XSFKHatlsqtLJ7ur6oVDq8LDq7qsxokOWnhCVwjCE3kzfN6WggkCWiN9iM2lnwFhBn/CPBN Q1CUsL8zQCNJPM5xccH6qo4XpIh85wpco69yjYv5uiykN4BFvd1KRJNRaH14ldTDhZw== X-Received: by 2002:a37:4c47:: with SMTP id z68-v6mr8335705qka.233.1528547715670; Sat, 09 Jun 2018 05:35:15 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLoleLfw8ASkpfOLBbVMzAO4c7LukbFJfqIOXR4JwuUfV37cHchdX4V+3g9Z3cViG1+Pxt0 X-Received: by 2002:a37:4c47:: with SMTP id z68-v6mr8335685qka.233.1528547715125; Sat, 09 Jun 2018 05:35:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528547715; cv=none; d=google.com; s=arc-20160816; b=BY1Mw8ARMkkhy01vAoxwoYvu9zJiQTT0BfTxn2uBU/6L006978s41ujaK6hwusxtjp N2/dNKGQQ10wt0ikswiVZ3GdEsit0GGOrHt60DAJ/jOAmvHFEb8gb8pGHGVeETNQwGLe j3K+pllBXzbNhmXetn8r/zIqPn6E5XKTXiK/1xhr1Ec6pwIHLvmveJxLHrfYOyLGvNCS qfp7YuN+SMzUR5/o+sVYo9JJTcRiYL1YquTTke0DKEXTa7vONNJjsMOZnE5tEaTEThDQ wrowAZXUrq4sp3Zl5H5fz8cu+eukI9t1yVQ0tythbzQPC7evffpiyggZiy5XfeN4yGEp JkKg== 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=I/RCnTTvJ5+fBvJ2GgPwKpieLv29HGy7FgsIlHR8Bo0=; b=MldLyefazbUCqsarLzRk+Uu+MzDtmfLI+bfn88mTvOPonFQE6aYexqB/OJcrm2fgs2 VWYXexujXwGOuX/6+WBLXBmN3fDQYNsS/y9YGsbVyQRet022jAV0pYFYK0bkOGo/YH56 WnoSyYF6MRleKYM0xTdJZBWXbYPkd+UxmrC6uWx+ADKGeRe3r9aMZMF00APWDTXyjKpN AYijXU745wDDY/ttYVR+BKyVS76MWjeRB1U1RFp8AxBnXyOTmTNcMorbGwlZZ7VNt80N y663mbIX+2YVhlSY8EbHEyuJIkbwRC8KDcaPDGUc3+LrDmx122SWkyvBm1QHTCHLBGN3 CKIQ== 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 h134-v6si5276595qke.208.2018.06.09.05.35.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Jun 2018 05:35:15 -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 83459406E897; Sat, 9 Jun 2018 12:35:14 +0000 (UTC) Received: from localhost (ovpn-12-40.pek2.redhat.com [10.72.12.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id A4E4C2023488; Sat, 9 Jun 2018 12:35:09 +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 25/30] exofs: conver to bio_for_each_chunk_segment_all Date: Sat, 9 Jun 2018 20:30:09 +0800 Message-Id: <20180609123014.8861-26-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.4 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:14 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Sat, 09 Jun 2018 12:35:14 +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_segment_all() can't be used any more after multipage bvec is enabled, so we have to convert to bio_for_each_chunk_segment_all() Signed-off-by: Ming Lei --- fs/exofs/ore.c | 3 ++- fs/exofs/ore_raid.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/exofs/ore.c b/fs/exofs/ore.c index ddbf87246898..fe2eb28de358 100644 --- a/fs/exofs/ore.c +++ b/fs/exofs/ore.c @@ -406,8 +406,9 @@ static void _clear_bio(struct bio *bio) { struct bio_vec *bv; unsigned i; + struct bvec_chunk_iter citer; - bio_for_each_segment_all(bv, bio, i) { + bio_for_each_chunk_segment_all(bv, bio, i, citer) { unsigned this_count = bv->bv_len; if (likely(PAGE_SIZE == this_count)) diff --git a/fs/exofs/ore_raid.c b/fs/exofs/ore_raid.c index 27cbdb697649..4da3065ce976 100644 --- a/fs/exofs/ore_raid.c +++ b/fs/exofs/ore_raid.c @@ -433,11 +433,12 @@ static void _mark_read4write_pages_uptodate(struct ore_io_state *ios, int ret) /* loop on all devices all pages */ for (d = 0; d < ios->numdevs; d++) { struct bio *bio = ios->per_dev[d].bio; + struct bvec_chunk_iter citer; if (!bio) continue; - bio_for_each_segment_all(bv, bio, i) { + bio_for_each_chunk_segment_all(bv, bio, i, citer) { struct page *page = bv->bv_page; SetPageUptodate(page);