Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp2999838imm; Thu, 24 May 2018 20:52:43 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrDvvJ4IKwdYADG4SwjVJDmkcmeZMB8W+L/XdJjP6xgfRhEdjKQqHhnYXgAnMu0v1WQEp9C X-Received: by 2002:a63:9e42:: with SMTP id r2-v6mr629628pgo.436.1527220363462; Thu, 24 May 2018 20:52:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527220363; cv=none; d=google.com; s=arc-20160816; b=BQIgdV23cHsNJ0wf4gJmcng4RUSoWwmbxu0PWnsrf6nzQVv6tK+z8a66IdUfcAtvhc q/ysbWCGtwnS29bcH3iqwo2dXzjEQQeOlSQUCP4J42HYpyyPQbGP/FCFqrxbAbrM62Cn ceyBrOpMlUeFVPXWuP3jgBxZzJQmoI4zFhsH5s0dFgXo9Y4s54jWFHWtdLuoqDPSAeiU S/dCSRBZaG0lScRU3buCqoJ/XWA6XZqlxqEy3oFaTHRReorLkY2oXOmNLRVr4s+teecF DXtdDbShIHelVQ3UWC42m70BQ4teH0rXteyosoE4JOnkFgrmvZ8s4vJDezR90EOe8PQs DGEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=LlV2KufI0o/YeDYSKgBc9k059ri1adKmgALSIRvFcyU=; b=x0S8rjOVG1YR5Q5h/RVzd9W9P24RsptOWCAykgXULFCk1NFbcC827ukyRHYZp+2uyF VI5ISoVbGiMx6hUg9Kbb3OXHUsdFHMP/aSQZsfQ8N+KfAFK/l/Ezf9VNZQ9jfh3ZAWAv dd3uTaGjj9BRB0eQtS5WJWzsmrmxJk27Fou0vnLkNZDTPjz1SCDLvd9HdIY9dH9iQMGl txlLusWFXNLCB6NkaaG7YfPFzlT1oNqfiT5TnGS9RUvkuLTd3w/T3wNXhgEI3YfgQoHU BXdX2PZreRa4masxSDwaWnqkgIuMTjTRnHRsfu/zvTf+IfTEdMv9JfPjeY9v5oObLXAt kVAQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f7-v6si17358701pgn.479.2018.05.24.20.52.28; Thu, 24 May 2018 20:52:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935836AbeEYDvm (ORCPT + 99 others); Thu, 24 May 2018 23:51:42 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49916 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S935453AbeEYDvi (ORCPT ); Thu, 24 May 2018 23:51:38 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 47ABD40704B8; Fri, 25 May 2018 03:51:38 +0000 (UTC) Received: from localhost (ovpn-12-30.pek2.redhat.com [10.72.12.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41FBA2166BB2; Fri, 25 May 2018 03:51:30 +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 26/33] exofs: conver to bio_for_each_page_all2 Date: Fri, 25 May 2018 11:46:14 +0800 Message-Id: <20180525034621.31147-27-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.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 25 May 2018 03:51:38 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 25 May 2018 03:51:38 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'ming.lei@redhat.com' RCPT:'' Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(). 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 fe81fd6fe553..2a7e93f21695 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_iter_all bia; - bio_for_each_page_all(bv, bio, i) { + bio_for_each_page_all2(bv, bio, i, bia) { 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 2c3346cd1b29..bb0cc314a987 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_iter_all bia; if (!bio) continue; - bio_for_each_page_all(bv, bio, i) { + bio_for_each_page_all2(bv, bio, i, bia) { struct page *page = bv->bv_page; SetPageUptodate(page); -- 2.9.5