From f486f658f48861f663c40116646e9d5dfa4e3f1f Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 13 Aug 2009 10:13:00 +1000 Subject: [PATCH] --- yaml --- r: 156694 b: refs/heads/master c: a639755cf885e437b2fe4168d35157fa90d530ab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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);