Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Skip domain check for spare-same-slot 

If lost disk was the only one that belonged to particular domain, array
won't match with that domain any longer. We can achieve this by moving
domain check below the 'target' test.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Przemyslaw Czarnowski 2010-12-26 22:36:46 +11:00 committed by NeilBrown
parent b4924220f1
commit b6b3f0f7eb
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Incremental.c
View File

@ -952,15 +952,6 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
devname, mp->path);
goto next;
}
dl = domain_from_array(sra, st2->ss->name);
if (!domain_test(dl, pol, st2->ss->name)) {
/* domain test fails */
if (verbose > 1)
fprintf(stderr, Name ": not adding %s to %s as it is not in a compatible domain\n",
devname, mp->path);
goto next;
}
/* test against target.
* If 'target' is set and 'bare' is false, we only accept
* arrays/containers that match 'target'.
@ -988,6 +979,16 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
goto next;
}
dl = domain_from_array(sra, st2->ss->name);
if (!domain_test(dl, pol, st2->ss->name)) {
/* domain test fails */
if (verbose > 1)
fprintf(stderr, Name ": not adding %s to %s as"
" it is not in a compatible domain\n",
devname, mp->path);
goto next;
}
/* all tests passed, OK to add to this array */
if (!chosen) {
chosen = sra;