From: NeilBrown <neilb@suse.de>
Date: Fri, 6 Nov 2009 04:22:14 +0000 (+1100)
Subject: Grow: goto release rather than just return
X-Git-Tag: mdadm-3.1.1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5ea446ae7c5548b9f3d88a474dc641a6910ddaf;p=thirdparty%2Fmdadm.git

Grow: goto release rather than just return

otherwise we exit with the array frozen.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/Grow.c b/Grow.c
index 4423b787..75af6f3a 100644
--- a/Grow.c
+++ b/Grow.c
@@ -644,8 +644,10 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
 				layout_str = "parity-last";
 		} else {
 			c = map_num(pers, level);
-			if (c == NULL)
-				return 1;/* not possible */
+			if (c == NULL) {
+				rv = 1;/* not possible */
+				goto release;
+			}
 			err = sysfs_set_str(sra, NULL, "level", c);
 			if (err) {
 				fprintf(stderr, Name ": %s: could not set level to %s\n",
@@ -849,7 +851,8 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
 				if (nlayout == UnSet) {
 					fprintf(stderr, Name ": layout %s not understood for raid5.\n",
 						layout_str);
-					return 1;
+					rv = 1;
+					goto release;
 				}
 				break;
 
@@ -858,7 +861,8 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
 				if (nlayout == UnSet) {
 					fprintf(stderr, Name ": layout %s not understood for raid6.\n",
 						layout_str);
-					return 1;
+					rv = 1;
+					goto release;
 				}
 				break;
 			}