diff options
author | Neil Brown <neilb@suse.de> | 2002-04-04 01:58:32 +0000 |
---|---|---|
committer | Neil Brown <neilb@suse.de> | 2002-04-04 01:58:32 +0000 |
commit | e0d1903663dac9307a37646c26abf7991b0a9593 (patch) | |
tree | 882780adec3f7fa11826a34156426414db22d982 /Assemble.c | |
parent | 11a3e71da434939895cc504e20e735eb656b1c74 (diff) | |
download | mdadm-e0d1903663dac9307a37646c26abf7991b0a9593.tar.gz mdadm-e0d1903663dac9307a37646c26abf7991b0a9593.tar.xz mdadm-e0d1903663dac9307a37646c26abf7991b0a9593.zip |
mdadm-0.8mdadm-0.8
Diffstat (limited to 'Assemble.c')
-rw-r--r-- | Assemble.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -115,7 +115,7 @@ int Assemble(char *mddev, int mdfd, vers = md_get_version(mdfd); if (vers <= 0) { - fprintf(stderr, Name ": %s appears not to be an md device.\n"); + fprintf(stderr, Name ": %s appears not to be an md device.\n", mddev); return 1; } if (vers < 9000) { @@ -405,8 +405,8 @@ This doesnt work yet if (devices[j].oldmajor != super.disks[i].major || devices[j].oldminor != super.disks[i].minor) { change |= 2; - super.disks[i].major = devices[i].oldmajor; - super.disks[i].minor = devices[i].oldminor; + super.disks[i].major = devices[j].oldmajor; + super.disks[i].minor = devices[j].oldminor; } if (devices[j].uptodate && (super.disks[i].state != desired_state)) { @@ -491,7 +491,7 @@ This doesnt work yet if (runstop == 1 || (runstop == 0 && ( first_super.raid_disks == okcnt - || start_partial_ok && enough(first_super.level, first_super.raid_disks, okcnt)) + || (start_partial_ok && enough(first_super.level, first_super.raid_disks, okcnt))) )) { if (ioctl(mdfd, RUN_ARRAY, NULL)==0) { fprintf(stderr, Name ": %s has been started with %d drive%s", @@ -527,4 +527,5 @@ This doesnt work yet } } + return 0; } |