From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754721AbdBPLqV (ORCPT ); Thu, 16 Feb 2017 06:46:21 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:33423 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754648AbdBPLqR (ORCPT ); Thu, 16 Feb 2017 06:46:17 -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 03/17] md: raid1/raid10: use bio_remove_last_page() Date: Thu, 16 Feb 2017 19:45:33 +0800 Message-Id: <1487245547-24384-4-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 | 3 +-- drivers/md/raid10.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 85f309836fd7..6e4e0b868ff2 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2824,8 +2824,7 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr, if (bio->bi_end_io==NULL) continue; /* remove last page from this bio */ - bio->bi_vcnt--; - bio->bi_iter.bi_size -= len; + bio_remove_last_page(bio); bio_clear_flag(bio, BIO_SEG_VALID); } goto bio_full; diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 063c43d83b72..aa37d4c7900a 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -3447,8 +3447,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, bio2 && bio2 != bio; bio2 = bio2->bi_next) { /* remove last page from this bio */ - bio2->bi_vcnt--; - bio2->bi_iter.bi_size -= len; + bio_remove_last_page(bio2); bio_clear_flag(bio2, BIO_SEG_VALID); } goto bio_full; @@ -4538,8 +4537,7 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, bio2 && bio2 != bio; bio2 = bio2->bi_next) { /* Remove last page from this bio */ - bio2->bi_vcnt--; - bio2->bi_iter.bi_size -= len; + bio_remove_last_page(bio2); bio_clear_flag(bio2, BIO_SEG_VALID); } goto bio_full; -- 2.7.4