Fix error code from examine properly..

The last one was wrong :-(

Signed-off-by: Neil Brown <neilb@suse.de>
This commit is contained in:
Neil Brown 2006-06-02 01:32:45 +00:00
parent c97be4db86
commit e52f8e251a
1 changed files with 6 additions and 5 deletions

View File

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