From patchwork Thu Feb 16 11:45:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 9576947 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 A2579600C5 for ; Thu, 16 Feb 2017 11:50:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FF55285B7 for ; Thu, 16 Feb 2017 11:50:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 95086285B9; Thu, 16 Feb 2017 11:50:39 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57391285B7 for ; Thu, 16 Feb 2017 11:50:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932133AbdBPLqv (ORCPT ); Thu, 16 Feb 2017 06:46:51 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:33518 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932096AbdBPLqt (ORCPT ); Thu, 16 Feb 2017 06:46:49 -0500 Received: by mail-pg0-f67.google.com with SMTP id 5so1825784pgj.0; Thu, 16 Feb 2017 03:46:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GHmlYUJfePPPmEDPWpZQfvwxCySqlgAxSVA74HzKxHU=; b=VrtmWPhnDkOWGOrjP6MpIXV+YxJ6jcN4XEHjWwi8zUKGChUjILhMUNXp4fqoJWyi81 6I5WSal5DHei0g9HGe9Dr5vtVjf7pwUdR58LKUO6IcsGzKuJpz1fyBoC65b8Sj2CvepH JBdf/hEDBed6OlXjzcJoZCZPS1ZjoKv3ZsHemdYNcCIrK48R7bTdaPWzv0hQetSBFRDq Mz/E4jOymjkVvw5Ih6zOZdDKyTkSY+a0AiN1UWLI9zNY8RgV+OrE9l7g7g8pArjmDOi3 5e9H9ZXPQADZJeqcFXqs4V2FRCjtMrRvLjoxefWmK4vKgirbc4wqCh9Ndqa6zGQkeZ4/ gEHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GHmlYUJfePPPmEDPWpZQfvwxCySqlgAxSVA74HzKxHU=; b=LtCKX6qVboLQOCfo0dKXG2jZPVG58U6yl18xpkNIdJu9Anf5Tdike4pZtjipmPgtYp uaM2iJhZZ2F5uSMN/xUROcF1kW92M1jatDs21JJX/isnlvPIGuufDO9OB5etFyAmUcUX gj4pg7V+ZCMam8xpeFOG479sht/c3dUO/FhwQ2WySKG9+3rXjZ5fyBsWtfiJ4YxlKAnl MUXrN+1YpnjaDQtH6GV0qZh774qzR1UUlgJxnBbEAHWQuTMfr4r3H9/ETmCNSkZXyIME +IFRc9vbOvEKAAYQ1esdmgvZmzOt6Vh3NppWXWZ9DcknypEJOwCjAExY0R3+hVqfB4LJ tYyg== X-Gm-Message-State: AMke39ltnVJqa66G9HbN+ghaE3VM/Mk65UBcwAIVr4B7QljKsBnGZXo1Fl9TdHJe91GF+w== X-Received: by 10.84.138.3 with SMTP id 3mr2607535plo.94.1487245598449; Thu, 16 Feb 2017 03:46:38 -0800 (PST) Received: from localhost (li405-222.members.linode.com. [106.187.53.222]) by smtp.gmail.com with ESMTPSA id e127sm13261204pfh.89.2017.02.16.03.46.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Feb 2017 03:46:37 -0800 (PST) From: Ming Lei To: Shaohua Li , Jens Axboe , linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, linux-block@vger.kernel.org, Christoph Hellwig , NeilBrown Cc: Ming Lei Subject: [PATCH 09/17] md: raid1/raid10: use bio helper in *_pool_free Date: Thu, 16 Feb 2017 19:45:39 +0800 Message-Id: <1487245547-24384-10-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487245547-24384-1-git-send-email-tom.leiming@gmail.com> References: <1487245547-24384-1-git-send-email-tom.leiming@gmail.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ming Lei --- drivers/md/raid1.c | 13 ++++++++++--- drivers/md/raid10.c | 11 +++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index ebea8615344a..1dd6b2760fba 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -172,9 +172,16 @@ static void r1buf_pool_free(void *__r1_bio, void *data) int i,j; struct r1bio *r1bio = __r1_bio; - for (i = 0; i < RESYNC_PAGES; i++) - for (j = pi->raid_disks; j-- ;) - safe_put_page(r1bio->bios[j]->bi_io_vec[i].bv_page); + for (i = 0; i < pi->raid_disks; i++) { + struct bio_vec *bvl; + struct bio *bio = r1bio->bios[i]; + + /* make sure all pages can be freed */ + bio->bi_vcnt = RESYNC_PAGES; + + bio_for_each_segment_all(bvl, bio, j) + safe_put_page(bvl->bv_page); + } for (i=0 ; i < pi->raid_disks; i++) bio_put(r1bio->bios[i]); diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 8262f3e1dd93..5c698f3d3083 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -230,10 +230,13 @@ static void r10buf_pool_free(void *__r10_bio, void *data) for (j=0; j < conf->copies; j++) { struct bio *bio = r10bio->devs[j].bio; if (bio) { - for (i = 0; i < RESYNC_PAGES; i++) { - safe_put_page(bio->bi_io_vec[i].bv_page); - bio->bi_io_vec[i].bv_page = NULL; - } + struct bio_vec *bvl; + + /* make sure all pages can be freed */ + bio->bi_vcnt = RESYNC_PAGES; + + bio_for_each_segment_all(bvl, bio, i) + safe_put_page(bvl->bv_page); bio_put(bio); } bio = r10bio->devs[j].repl_bio;