/*
* mdadm - manage Linux "md" devices aka RAID arrays.
*
- * Copyright (C) 2001-2002 Neil Brown <neilb@cse.unsw.edu.au>
+ * Copyright (C) 2001-2006 Neil Brown <neilb@suse.de>
*
*
* This program is free software; you can redistribute it and/or modify
}
} else if (runstop < 0){
if (ioctl(fd, STOP_ARRAY, NULL)) {
- if (!quiet)
+ if (quiet==0)
fprintf(stderr, Name ": fail to stop array %s: %s\n",
devname, strerror(errno));
return 1;
}
+ if (quiet <= 0)
+ fprintf(stderr, Name ": stopped %s\n", devname);
}
return 0;
}
continue;
if ((disc.state & 4)==0) continue; /* sync */
/* Looks like a good device to try */
- dev = map_dev(disc.major, disc.minor);
+ dev = map_dev(disc.major, disc.minor, 1);
if (!dev) continue;
- dfd = open(dev, O_RDONLY);
+ dfd = dev_open(dev, O_RDONLY);
if (dfd < 0) continue;
if (st->ss->load_super(st, dfd, &dsuper, NULL)) {
close(dfd);
* If so, we can simply re-add it.
*/
st->ss->uuid_from_super(duuid, dsuper);
-
- if (osuper) {
+
+ /* re-add doesn't work for version-1 superblocks
+ * before 2.6.18 :-(
+ */
+ if (array.major_version == 1 &&
+ get_linux_version() <= 2006018)
+ ;
+ else if (osuper) {
st->ss->uuid_from_super(ouuid, osuper);
if (memcmp(duuid, ouuid, sizeof(ouuid))==0) {
/* look close enough for now. Kernel
* based reconstruct is possible
*/
struct mdinfo mdi;
- struct mddev_ident_s ident;
- st->ss->getinfo_super(&mdi, &ident, osuper);
+ st->ss->getinfo_super(&mdi, osuper);
disc.major = major(stb.st_rdev);
disc.minor = minor(stb.st_rdev);
disc.number = mdi.disk.number;
if (ioctl(fd, ADD_NEW_DISK, &disc) == 0) {
if (verbose >= 0)
fprintf(stderr, Name ": re-added %s\n", dv->devname);
- return 0;
+ continue;
}
/* fall back on normal-add */
}
}
}
- for (j=0; j< st->max_devs; j++) {
+ /* in 2.6.17 and earlier, version-1 superblocks won't
+ * use the number we write, but will choose a free number.
+ * we must choose the same free number, which requires
+ * starting at 'raid_disks' and counting up
+ */
+ for (j = array.raid_disks; j< st->max_devs; j++) {
disc.number = j;
if (ioctl(fd, GET_DISK_INFO, &disc))
break;
if (dv->writemostly)
disc.state |= 1 << MD_DISK_WRITEMOSTLY;
st->ss->add_to_super(dsuper, &disc);
- if (st->ss->write_init_super(st, dsuper, &disc, dv->devname, 0 /* FIXME */))
+ if (st->ss->write_init_super(st, dsuper, &disc, dv->devname))
return 1;
} else if (dv->re_add) {
/* this had better be raid1.
break;
}
}
+ if (dv->writemostly)
+ disc.state |= (1 << MD_DISK_WRITEMOSTLY);
if (ioctl(fd,ADD_NEW_DISK, &disc)) {
fprintf(stderr, Name ": add new device failed for %s as %d: %s\n",
dv->devname, j, strerror(errno));