lkml.org 
[lkml]   [2017]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/17] md: raid1/raid10: don't use .bi_vcnt to check if all pages are added
    Date
    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 <tom.leiming@gmail.com>
    ---
    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
    \
     
     \ /
      Last update: 2017-02-16 12:47    [W:2.091 / U:0.808 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site