From: Neil Brown <neilb@suse.de>
Date: Fri, 2 Jun 2006 01:32:45 +0000 (+0000)
Subject: Fix error code from examine properly..
X-Git-Tag: mdadm-2.5.1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e52f8e251ac2f98daec3bbb7c4b6df8266c23efa;p=thirdparty%2Fmdadm.git

Fix error code from examine properly..

The last one was wrong :-(

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

diff --git a/Examine.c b/Examine.c
index 8a8f8f44..a7bbbdbe 100644
--- a/Examine.c
+++ b/Examine.c
@@ -77,8 +77,9 @@ int Examine(mddev_dev_t devlist, int brief, int scan,
 			if (!scan) {
 				fprintf(stderr,Name ": cannot open %s: %s\n",
 					devlist->devname, strerror(errno));
-				err = 1;
+				rv = 1;
 			}
+			err = 1;
 		}
 		else {
 			if (!st)
@@ -86,16 +87,16 @@ int Examine(mddev_dev_t devlist, int brief, int scan,
 			if (st)
 				err = st->ss->load_super(st, fd, &super, (brief||scan)?NULL:devlist->devname);
 			else {
-				if (!brief)
+				if (!brief) {
 					fprintf(stderr, Name ": No md superblock detected on %s.\n", devlist->devname);
+					rv = 1;
+				}
 				err = 1;
 			}
 			close(fd);
 		}
-		if (err) {
-			rv = 1;
+		if (err)
 			continue;
-		}
 
 		if (SparcAdjust)
 			st->ss->update_super(NULL, super, "sparc2.2", devlist->devname, 0, 0, NULL);