From patchwork Thu Feb 16 11:45:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 9576905 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 9E751600C5 for ; Thu, 16 Feb 2017 11:46:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E22228546 for ; Thu, 16 Feb 2017 11:46:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 932DB285B7; Thu, 16 Feb 2017 11:46:34 +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=ham 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 3EECE28546 for ; Thu, 16 Feb 2017 11:46:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754723AbdBPLqc (ORCPT ); Thu, 16 Feb 2017 06:46:32 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35124 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753869AbdBPLqa (ORCPT ); Thu, 16 Feb 2017 06:46:30 -0500 Received: by mail-pf0-f194.google.com with SMTP id 68so1479893pfx.2; Thu, 16 Feb 2017 03:46:30 -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=McwhtsTDxYKucg6PmEBTK/K5CG5Mdig5D2KhZB31omk=; b=rLCqf9WEDbeTeKSLRocOSSughymPfx8UK/wOdbUGt12bYU486nSldMXtWv5DTP0xek Ou/2AmlJMc8hpqPySQQR1WY7S0sIebsySF043/RsJCcISF3l5wlrsr6kAWMUnCvrJIyI 5ph6r8mFcyE4G4OpIsOwzpsgfeTTFFeQkW+89h9aQmCPp07j5Faj7ab4oDkFAkxyd2gK vR8sy7YagcSxsT8nyP9MevN7VUfyXLhQljw3LAp8p3/0tKsAYktp6nAYdlPP5pkOLq63 B1h49zOkR7022GDpxqw37r9bhBzC2eU+1S8p9d+kxtod8M2VOaGKyGDidARWjaVMIP/n Hl9Q== 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=McwhtsTDxYKucg6PmEBTK/K5CG5Mdig5D2KhZB31omk=; b=icCvmO5kH6Dx7L+52iV+VMJteWTMVS/yOQmwFfVK1dUAuUkbI43d0QvIIq7q+G22dC g1QvJGd0asIyZYbR4bnYaMhYu3QotzWpNOX5VuEdgg2w77soaaqHiSAUzObE8oRXUnwt 8SQtHM1oq9tJiPfxXfjHySJ1Fa5WRuvZaa9f6nqhufwUen1bLEUCCsObY+JHugovUByg rRPCIOJGf91chhUUVGuTgM0CDzlkeoWLf9T12bSzVu4wbe2yVXjaE45JasWctc7MKaYI T2/QO4/DcQNbe83soSE6fxUvNPPJLSAcSack10GE8Gfn4Q3TfkxNmYo8uh/vUtgMF4xQ CFaA== X-Gm-Message-State: AMke39nDZv7ZRekkbHA1Df5CieGdi1IzTmucf9OQbfDkwigd/WfHARY+oKW/n9Bo7P//KQ== X-Received: by 10.84.233.194 with SMTP id m2mr2649106pln.126.1487245584833; Thu, 16 Feb 2017 03:46:24 -0800 (PST) Received: from localhost (li405-222.members.linode.com. [106.187.53.222]) by smtp.gmail.com with ESMTPSA id s3sm13352944pgn.55.2017.02.16.03.46.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Feb 2017 03:46:24 -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 05/17] md: raid1/raid10: use the introduced helpers Date: Thu, 16 Feb 2017 19:45:35 +0800 Message-Id: <1487245547-24384-6-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 This patch uses the introduced helpers to fetch pre-allocated page from bio bvec table, and store it back. Signed-off-by: Ming Lei --- drivers/md/raid1.c | 4 ++-- drivers/md/raid10.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 6e4e0b868ff2..c4791fbd69ac 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2814,10 +2814,10 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr, for (i = 0 ; i < conf->raid_disks * 2; i++) { bio = r1_bio->bios[i]; if (bio->bi_end_io) { - page = bio->bi_io_vec[bio->bi_vcnt].bv_page; + page = mdev_get_page_from_bio(bio, bio->bi_vcnt); if (bio_add_page(bio, page, len, 0) == 0) { /* stop here */ - bio->bi_io_vec[bio->bi_vcnt].bv_page = page; + mdev_put_page_to_bio(bio, bio->bi_vcnt, page); while (i > 0) { i--; bio = r1_bio->bios[i]; diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index aa37d4c7900a..b7dfbca869a3 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -3437,12 +3437,12 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, break; for (bio= biolist ; bio ; bio=bio->bi_next) { struct bio *bio2; - page = bio->bi_io_vec[bio->bi_vcnt].bv_page; + page = mdev_get_page_from_bio(bio, bio->bi_vcnt); if (bio_add_page(bio, page, len, 0)) continue; /* stop here */ - bio->bi_io_vec[bio->bi_vcnt].bv_page = page; + mdev_put_page_to_bio(bio, bio->bi_vcnt, page); for (bio2 = biolist; bio2 && bio2 != bio; bio2 = bio2->bi_next) {