summaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2011-01-31 11:57:42 +1100
committerNeilBrown <neilb@suse.de>2011-01-31 11:57:42 +1100
commitde171cb9a52598cc023adceafc6c166112401386 (patch)
tree56fc899c45b538dedba0fc139e3213a0f47f9a59 /drivers/md
parent1f0324caefd39985e9fe052fac97da31694db31e (diff)
downloadop-kernel-dev-de171cb9a52598cc023adceafc6c166112401386.zip
op-kernel-dev-de171cb9a52598cc023adceafc6c166112401386.tar.gz
md: revert change to raid_disks on failure.
If we try to update_raid_disks and it fails, we should put 'delta_disks' back to zero. This is important because some code, such as slot_store, assumes that delta_disks has been validated. Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/md.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index b76cfc8..e636e404 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -5578,6 +5578,8 @@ static int update_raid_disks(mddev_t *mddev, int raid_disks)
mddev->delta_disks = raid_disks - mddev->raid_disks;
rv = mddev->pers->check_reshape(mddev);
+ if (rv < 0)
+ mddev->delta_disks = 0;
return rv;
}
OpenPOWER on IntegriCloud