diff --git a/[refs] b/[refs] index 2a51b0115fcd..8bb9b44023de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67ac6011db5d2b0c853d573ff474b25c85dfb644 +refs/heads/master: a639755cf885e437b2fe4168d35157fa90d530ab diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index b8a22a2205cf..94a74cb5cccb 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -3785,7 +3785,7 @@ static sector_t reshape_request(mddev_t *mddev, sector_t sector_nr, int *skipped conf->reshape_progress < raid5_size(mddev, 0, 0)) { sector_nr = raid5_size(mddev, 0, 0) - conf->reshape_progress; - } else if (mddev->delta_disks > 0 && + } else if (mddev->delta_disks >= 0 && conf->reshape_progress > 0) sector_nr = conf->reshape_progress; sector_div(sector_nr, new_data_disks);