From: NeilBrown <neilb@suse.de>
Date: Thu, 29 Jul 2010 03:16:01 +0000 (+1000)
Subject: Fix use of rv in Grow_reshape
X-Git-Tag: mdadm-3.1.3~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7e734fc22cb37d42a3c6fec6343490be929f6aa;p=thirdparty%2Fmdadm.git

Fix use of rv in Grow_reshape

1/ and extra local var was declared, which causes rv setting
   to be lost
2/ a -ve rv was left -ve while we should be return 1 on err.

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

diff --git a/Grow.c b/Grow.c
index dd05d4d9..e466a08e 100644
--- a/Grow.c
+++ b/Grow.c
@@ -759,6 +759,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
 					if (err == EBUSY && 
 					    (array.state & (1<<MD_SB_BITMAP_PRESENT)))
 						fprintf(stderr, "       Bitmap must be removed before level can be changed\n");
+					rv = 1;
 				}
 			}
 		} else if (!changed && !quiet)
@@ -789,7 +790,6 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
 
 		array.layout = parse_layout_faulty(layout_str);
 		if (array.layout < 0) {
-			int rv;
 			fprintf(stderr, Name ": %s: layout %s not understood for 'faulty' array\n",
 				devname, layout_str);
 			rv = 1;