]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Fix error code from examine properly..
authorNeil Brown <neilb@suse.de>
Fri, 2 Jun 2006 01:32:45 +0000 (01:32 +0000)
committerNeil Brown <neilb@suse.de>
Fri, 2 Jun 2006 01:32:45 +0000 (01:32 +0000)
The last one was wrong :-(

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

index 8a8f8f4461aef2b379d64c77d3842b892190986b..a7bbbdbe5f892c05583289bb4aec7cff424409be 100644 (file)
--- 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);