Thanks for these three.
I have applied the first,
applied the seconds with a couple of changes as mentioned below,
but I haven't applied the first. I don't like the fact that knowledge about
imsm is explicitly hard-coded into mdadm.c All explicit knowledge about imsm
should be in super-intel.c...
I think you can make this work by adding some code in to Assemble() just near:
/* Now reject spares that don't match domains of identified members */
at that point, if (!st || !st->sb), then we could include all those spares
which have ->used == 3.
i.e. when there are now more arrays to be found, all the spares get included
into one last array.
It might make sense to have an new super_switch field which gives the name of
the array-of-spares as there is no name stored in the spares to use ... just
a thought though, you might not need that.
Could you try that and see if you can make it work?
The issues I fixed with this second patch are:
> @@ -78,7 +78,8 @@ static int ident_matches(struct mddev_ident *ident,
> {
>
> if (ident->uuid_set && (!update || strcmp(update, "uuid")!= 0) &&
> - same_uuid(content->uuid, ident->uuid, tst->ss->swapuuid)==0) {
> + same_uuid(content->uuid, ident->uuid, tst->ss->swapuuid)==0 &&
> + memcmp(content->uuid, uuid_zero, sizeof(int[4]))) {
> if (devname)
> fprintf(stderr, Name ": %s has wrong uuid.\n",
> devname);
I really really don't like that way of testing the return value of memcmp (or
strcmp). It make it very hard to read - for me at least.
I *always* want to see one a comparison with zero with memcmp or strcmp.
So:
memcmp() == 0
means the values are equal,
memcmp() > 0
means the first is greater than the second
etc. So the comparison operator just has to be moved in my thoughts
in between the two values and I can see clearly what is intended.
> @@ -350,6 +352,7 @@ int Assemble(struct supertype *st, char *mddev,
> } else
> found_container = 1;
> } else {
> + pol = devnum_policy(stb.st_rdev);
> if (!tst && (tst = guess_super(dfd)) == NULL) {
> if (report_missmatch)
> fprintf(stderr, Name ": no recogniseable superblock on %s\n",
> @@ -366,7 +369,7 @@ int Assemble(struct supertype *st, char *mddev,
> 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)),
> + !conf_test_metadata(tst->ss->name, pol,
> tst->ss->match_home(tst, homehost) == 1)) {
> if (report_missmatch)
> fprintf(stderr, Name ": %s has metadata type %s for which "
I have reverted this change. I only want the devnum_policy to be computed if
it is needed.
Thanks,
NeilBrown
--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
