devname);
return 0;
}
+ if (ident->member && ident->member[0]) {
+ /* content->text_version must match */
+ char *s = strchr(content->text_version+1, '/');
+ if (s == NULL) {
+ if (devname)
+ fprintf(stderr, Name ": %s is not a container and one is required.\n",
+ devname);
+ return 0;
+ } else if (strcmp(ident->member, s+1) != 0) {
+ if (devname)
+ fprintf(stderr, Name ": skipping wrong member %s is %s\n",
+ content->text_version, devname);
+ return 0;
+ }
+ }
return 1;
}
int Assemble(struct supertype *st, char *mddev,
struct mddev_ident *ident,
- struct mddev_dev *devlist, char *backup_file,
+ struct mddev_dev *devlist,
+ char *backup_file, int invalid_backup,
int readonly, int runstop,
char *update, char *homehost, int require_homehost,
int verbose, int force)
*/
for (tmpdev = devlist;
tmpdev;
- tmpdev = tmpdev->next) {
+ tmpdev = tmpdev ? tmpdev->next : NULL) {
char *devname = tmpdev->devname;
int dfd;
struct stat stb;
struct supertype *tst = dup_super(st);
struct dev_policy *pol = NULL;
+ int found_container = 0;
if (tmpdev->used > 1) continue;
fprintf(stderr, Name ": %s is not a block device.\n",
devname);
tmpdev->used = 2;
- } else if (!tst && (tst = guess_super(dfd)) == NULL) {
- if (report_missmatch)
- fprintf(stderr, Name ": no recogniseable superblock on %s\n",
- devname);
- tmpdev->used = 2;
- } else if (tst->ss->load_super(tst,dfd, NULL)) {
- if (report_missmatch)
- fprintf(stderr, Name ": no RAID superblock on %s\n",
- devname);
- tmpdev->used = 2;
- } else if (tst->ss->compare_super == NULL) {
- if (report_missmatch)
- fprintf(stderr, Name ": Cannot assemble %s metadata on %s\n",
- tst->ss->name, devname);
- tmpdev->used = 2;
- } else if (auto_assem && st == NULL &&
- !conf_test_metadata(tst->ss->name, (pol = devnum_policy(stb.st_rdev)),
- tst->ss->match_home(tst, homehost) == 1)) {
- if (report_missmatch)
- fprintf(stderr, Name ": %s has metadata type %s for which "
- "auto-assembly is disabled\n",
- devname, tst->ss->name);
- tmpdev->used = 2;
+ } else if (must_be_container(dfd)) {
+ if (st) {
+ /* already found some components, this cannot
+ * be another one.
+ */
+ if (report_missmatch)
+ fprintf(stderr, Name ": %s is a container, but we are looking for components\n",
+ devname);
+ tmpdev->used = 2;
+ } if (!tst && (tst = super_by_fd(dfd, NULL)) == NULL) {
+ if (report_missmatch)
+ fprintf(stderr, Name ": not a recognisable container: %s\n",
+ devname);
+ tmpdev->used = 2;
+ } else if (!tst->ss->load_container
+ || tst->ss->load_container(tst, dfd, NULL)) {
+ if (report_missmatch)
+ fprintf(stderr, Name ": no correct container type: %s\n",
+ devname);
+ tmpdev->used = 2;
+ } else if (auto_assem &&
+ !conf_test_metadata(tst->ss->name, (pol = devnum_policy(stb.st_rdev)),
+ tst->ss->match_home(tst, homehost) == 1)) {
+ if (report_missmatch)
+ fprintf(stderr, Name ": %s has metadata type %s for which "
+ "auto-assembly is disabled\n",
+ devname, tst->ss->name);
+ tmpdev->used = 2;
+ } else
+ found_container = 1;
} else {
- content = &info;
- memset(content, 0, sizeof(*content));
- tst->ss->getinfo_super(tst, content, NULL);
+ if (!tst && (tst = guess_super(dfd)) == NULL) {
+ if (report_missmatch)
+ fprintf(stderr, Name ": no recogniseable superblock on %s\n",
+ devname);
+ tmpdev->used = 2;
+ } else if (tst->ss->load_super(tst,dfd, NULL)) {
+ if (report_missmatch)
+ fprintf(stderr, Name ": no RAID superblock on %s\n",
+ devname);
+ tmpdev->used = 2;
+ } else if (tst->ss->compare_super == NULL) {
+ if (report_missmatch)
+ fprintf(stderr, Name ": Cannot assemble %s metadata on %s\n",
+ tst->ss->name, devname);
+ tmpdev->used = 2;
+ } else if (auto_assem && st == NULL &&
+ !conf_test_metadata(tst->ss->name, (pol = devnum_policy(stb.st_rdev)),
+ tst->ss->match_home(tst, homehost) == 1)) {
+ if (report_missmatch)
+ fprintf(stderr, Name ": %s has metadata type %s for which "
+ "auto-assembly is disabled\n",
+ devname, tst->ss->name);
+ tmpdev->used = 2;
+ }
}
if (dfd >= 0) close(dfd);
if (tmpdev->used == 2) {
return 1;
}
- if (tst->ss->container_content
- && tst->loaded_container) {
+ if (found_container) {
/* tmpdev is a container. We need to be either
* looking for a member, or auto-assembling
*/
- if (st) {
- /* already found some components, this cannot
- * be another one.
- */
- if (report_missmatch)
- fprintf(stderr, Name ": %s is a container, but we are looking for components\n",
- devname);
- goto loop;
- }
if (ident->container) {
if (ident->container[0] == '/' &&
if (ident->container[0] != '/') {
/* we have a uuid */
int uuid[4];
+
+ content = &info;
+ memset(content, 0, sizeof(*content));
+ tst->ss->getinfo_super(tst, content, NULL);
+
if (!parse_uuid(ident->container, uuid) ||
!same_uuid(content->uuid, uuid, tst->ss->swapuuid)) {
if (report_missmatch)
fprintf(stderr, Name ": looking in container %s\n",
devname);
- tmpdev->content = tst->ss->container_content(tst, NULL);
- next_member:
- if (tmpdev->content)
- content = tmpdev->content;
-
- if (!content)
- goto loop; /* empty container */
-
- tmpdev->content = content->next;
- if (tmpdev->content == NULL)
- tmpdev->used = 2;
+ for (content = tst->ss->container_content(tst, NULL);
+ content;
+ content = content->next) {
- if (!ident_matches(ident, content, tst,
- homehost, update,
- report_missmatch ? devname : NULL))
- goto next_member;
-
- /* we have the one container we need, don't keep
- * looking. If the chosen member is active, skip.
- */
- if (is_member_busy(content->text_version)) {
- if (report_missmatch)
- fprintf(stderr, Name ": member %s in %s is already assembled\n",
- content->text_version,
- devname);
- skip:
- if (tmpdev->content)
- goto next_member;
- tst->ss->free_super(tst);
- tst = NULL;
- content = NULL;
- if (auto_assem)
- goto loop;
- dev_policy_free(pol);
- return 1;
- }
- if (ident->member && ident->member[0]) {
- char *s = strchr(content->text_version+1, '/');
- if (s == NULL) {
- fprintf(stderr, Name ": badly formatted version: %s\n",
- content->text_version);
- goto skip;
- }
- if (strcmp(ident->member, s+1) != 0) {
+ if (!ident_matches(ident, content, tst,
+ homehost, update,
+ report_missmatch ? devname : NULL))
+ /* message already printed */;
+ else if (is_member_busy(content->text_version)) {
if (report_missmatch)
- fprintf(stderr,
- Name ": skipping wrong member %s\n",
- content->text_version);
- goto skip;
- }
+ fprintf(stderr, Name ": member %s in %s is already assembled\n",
+ content->text_version,
+ devname);
+ } else
+ break;
+ }
+ if (!content) {
+ tmpdev->used = 2;
+ goto loop; /* empty container */
}
+
st = tst; tst = NULL;
if (!auto_assem && inargv && tmpdev->next != NULL) {
fprintf(stderr, Name ": %s is a container, but is not "
if (verbose > 0)
fprintf(stderr, Name ": found match on member %s in %s\n",
content->text_version, devname);
- break;
- }
- if (ident->container || ident->member) {
- /* No chance of this matching if we don't have
- * a container */
- if (report_missmatch)
- fprintf(stderr, Name "%s is not a container, and one is required.\n",
- devname);
+ /* make sure we finished the loop */
+ tmpdev = NULL;
goto loop;
- }
+ } else {
- if (!ident_matches(ident, content, tst,
- homehost, update,
- report_missmatch ? devname : NULL))
- goto loop;
+ content = &info;
+ memset(content, 0, sizeof(*content));
+ tst->ss->getinfo_super(tst, content, NULL);
- if (st == NULL)
- st = dup_super(tst);
- if (st->minor_version == -1)
- st->minor_version = tst->minor_version;
- if (st->ss != tst->ss ||
- st->minor_version != tst->minor_version ||
- st->ss->compare_super(st, tst) != 0) {
- /* Some mismatch. If exactly one array matches this host,
- * we can resolve on that one.
- * Or, if we are auto assembling, we just ignore the second
- * for now.
- */
- if (auto_assem)
+ if (!ident_matches(ident, content, tst,
+ homehost, update,
+ report_missmatch ? devname : NULL))
goto loop;
- if (homehost) {
- int first = st->ss->match_home(st, homehost);
- int last = tst->ss->match_home(tst, homehost);
- if (first != last &&
- (first == 1 || last == 1)) {
- /* We can do something */
- if (first) {/* just ignore this one */
- if (report_missmatch)
- fprintf(stderr, Name ": %s misses out due to wrong homehost\n",
- devname);
- goto loop;
- } else { /* reject all those sofar */
- struct mddev_dev *td;
- if (report_missmatch)
- fprintf(stderr, Name ": %s overrides previous devices due to good homehost\n",
- devname);
- for (td=devlist; td != tmpdev; td=td->next)
- if (td->used == 1)
- td->used = 0;
- tmpdev->used = 1;
- goto loop;
+
+ if (st == NULL)
+ st = dup_super(tst);
+ if (st->minor_version == -1)
+ st->minor_version = tst->minor_version;
+ if (st->ss != tst->ss ||
+ st->minor_version != tst->minor_version ||
+ st->ss->compare_super(st, tst) != 0) {
+ /* Some mismatch. If exactly one array matches this host,
+ * we can resolve on that one.
+ * Or, if we are auto assembling, we just ignore the second
+ * for now.
+ */
+ if (auto_assem)
+ goto loop;
+ if (homehost) {
+ int first = st->ss->match_home(st, homehost);
+ int last = tst->ss->match_home(tst, homehost);
+ if (first != last &&
+ (first == 1 || last == 1)) {
+ /* We can do something */
+ if (first) {/* just ignore this one */
+ if (report_missmatch)
+ fprintf(stderr, Name ": %s misses out due to wrong homehost\n",
+ devname);
+ goto loop;
+ } else { /* reject all those sofar */
+ struct mddev_dev *td;
+ if (report_missmatch)
+ fprintf(stderr, Name ": %s overrides previous devices due to good homehost\n",
+ devname);
+ for (td=devlist; td != tmpdev; td=td->next)
+ if (td->used == 1)
+ td->used = 0;
+ tmpdev->used = 1;
+ goto loop;
+ }
}
}
+ fprintf(stderr, Name ": superblock on %s doesn't match others - assembly aborted\n",
+ devname);
+ tst->ss->free_super(tst);
+ st->ss->free_super(st);
+ dev_policy_free(pol);
+ return 1;
}
- fprintf(stderr, Name ": superblock on %s doesn't match others - assembly aborted\n",
- devname);
- tst->ss->free_super(tst);
- st->ss->free_super(st);
- dev_policy_free(pol);
- return 1;
+ tmpdev->used = 1;
}
-
- tmpdev->used = 1;
-
loop:
dev_policy_free(pol);
pol = NULL;
}
dfd = dev_open(devname, O_RDWR|O_EXCL);
- remove_partitions(dfd);
-
tst = dup_super(st);
if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) {
fprintf(stderr, Name ": cannot re-read metadata from %s - aborting\n",
int dfd;
dfd = dev_open(devname, O_RDWR|O_EXCL);
- remove_partitions(dfd);
-
if (dfd < 0 || tst->ss->load_super(tst, dfd, NULL) != 0) {
fprintf(stderr, Name ": cannot re-read metadata from %s - aborting\n",
devname);
devices[most_recent].i.events) {
devices[j].uptodate = 1;
if (i < content->array.raid_disks) {
- if (devices[j].i.recovery_start == MaxSector) {
+ if (devices[j].i.recovery_start == MaxSector ||
+ (content->reshape_active &&
+ j >= content->array.raid_disks - content->delta_disks)) {
okcnt++;
avail[i]=1;
} else
} else
fdlist[i] = -1;
}
- if (!err)
- err = Grow_restart(st, content, fdlist, bestcnt, backup_file, verbose > 0);
+ if (!err) {
+ err = Grow_restart(st, content, fdlist, bestcnt,
+ backup_file, verbose > 0);
+ if (err && invalid_backup) {
+ if (verbose > 0)
+ fprintf(stderr, Name ": continuing"
+ " without restoring backup\n");
+ err = 0;
+ }
+ }
while (i>0) {
i--;
if (fdlist[i]>=0) close(fdlist[i]);
j = chosen_drive;
if (j >= 0 /* && devices[j].uptodate */) {
+ int dfd = dev_open(devices[j].devname,
+ O_RDWR|O_EXCL);
+ if (dfd >= 0) {
+ remove_partitions(dfd);
+ close(dfd);
+ }
rv = add_disk(mdfd, st, content, &devices[j].i);
if (rv) {