From: NeilBrown <neilb@suse.de>
Date: Mon, 31 Jan 2011 00:57:42 +0000 (+1100)
Subject: md: revert change to raid_disks on failure.
X-Git-Tag: v3.0~1749^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de171cb9a52598cc023adceafc6c166112401386;p=platform%2Fkernel%2Flinux-amlogic.git

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>
---

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;
 }