From 0967878de495fdf3a400425df0f0d062761b3447 Mon Sep 17 00:00:00 2001 From: mav Date: Thu, 9 Apr 2015 10:05:58 +0000 Subject: [PATCH] MFC r280685: When searching for provider by name, prefer non-withered one. git-svn-id: svn://svn.freebsd.org/base/stable/10@281298 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/geom/geom_subr.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index f42aae511..bf14a86e8 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -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 -- 2.45.0