From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932099AbdBPLqk (ORCPT ); Thu, 16 Feb 2017 06:46:40 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:35848 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754759AbdBPLqh (ORCPT ); Thu, 16 Feb 2017 06:46:37 -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 07/17] md: raid1/raid10: don't use .bi_vcnt to check if all pages are added Date: Thu, 16 Feb 2017 19:45:37 +0800 Message-Id: <1487245547-24384-8-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 Instead we use the index of the pre-allocated pages buffer, it should be more explicit because the index(.bi_error) just means how many pages are added to the bio. Signed-off-by: Ming Lei --- drivers/md/raid1.c | 2 +- drivers/md/raid10.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 8904a9149671..23a3a678a9ed 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2835,7 +2835,7 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr, nr_sectors += len>>9; sector_nr += len>>9; sync_blocks -= (len>>9); - } while (r1_bio->bios[disk]->bi_vcnt < RESYNC_PAGES); + } while (r1_bio->bios[disk]->bi_error < RESYNC_PAGES); bio_full: /* return .bi_error back to bio */ for (i = 0 ; i < conf->raid_disks * 2; i++) { diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 9cfc22cd1330..8262f3e1dd93 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -3453,7 +3453,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, } nr_sectors += len>>9; sector_nr += len>>9; - } while (biolist->bi_vcnt < RESYNC_PAGES); + } while (biolist->bi_error < RESYNC_PAGES); bio_full: /* return .bi_error back to bio, and set resync's as -EIO */ for (bio= biolist ; bio ; bio=bio->bi_next) -- 2.7.4