d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When searching for provider by name, prefer non-withered one.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Alexander Motin 2015-03-26 11:02:29 +00:00
parent cf7f8a9de8
commit ba772028db
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/geom/geom_subr.c
View File

@ -683,21 +683,27 @@ g_provider_by_name(char const *arg)
{
struct g_class *cp;
struct g_geom *gp;
struct g_provider *pp;
struct g_provider *pp, *wpp;
if (strncmp(arg, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0)
arg += sizeof(_PATH_DEV) - 1;
wpp = NULL;
LIST_FOREACH(cp, &g_classes, class) {
LIST_FOREACH(gp, &cp->geom, geom) {
LIST_FOREACH(pp, &gp->provider, provider) {
if (!strcmp(arg, pp->name))
if (strcmp(arg, pp->name) != 0)
continue;
if ((gp->flags & G_GEOM_WITHER) == 0 &&
(pp->flags & G_PF_WITHER) == 0)
return (pp);
else
wpp = pp;
}
}
}
return (NULL);
return (wpp);
}
void