From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932150AbdBPLqw (ORCPT ); Thu, 16 Feb 2017 06:46:52 -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 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-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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; -- 2.7.4