From 804c32bfef6b0f02a7aac2235130f76f3a647764 Mon Sep 17 00:00:00 2001 From: ae Date: Thu, 26 Jan 2012 07:42:54 +0000 Subject: [PATCH] MFC r215118: Move code for search of existing geom into g_part_find_geom function and use this function instead of g_part_parm_geom in g_part_ctl_create. git-svn-id: svn://svn.freebsd.org/base/stable/8@230565 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/geom/part/g_part.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index f1682931d..ce81bdc67 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -299,6 +299,17 @@ g_part_new_provider(struct g_geom *gp, struct g_part_table *table, g_error_provider(entry->gpe_pp, 0); } +static struct g_geom* +g_part_find_geom(const char *name) +{ + struct g_geom *gp; + LIST_FOREACH(gp, &g_part_class.geom, geom) { + if (!strcmp(name, gp->name)) + break; + } + return (gp); +} + static int g_part_parm_geom(const char *name, struct g_geom **v) { @@ -306,10 +317,7 @@ g_part_parm_geom(const char *name, struct g_geom **v) if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) name += strlen(_PATH_DEV); - LIST_FOREACH(gp, &g_part_class.geom, geom) { - if (!strcmp(name, gp->name)) - break; - } + gp = g_part_find_geom(name); if (gp == NULL) return (EINVAL); *v = gp; @@ -682,8 +690,8 @@ g_part_ctl_create(struct gctl_req *req, struct g_part_parms *gpp) g_topology_assert(); /* Check that there isn't already a g_part geom on the provider. */ - error = g_part_parm_geom(pp->name, &gp); - if (!error) { + gp = g_part_find_geom(pp->name); + if (gp != NULL) { null = gp->softc; if (null->gpt_scheme != &g_part_null_scheme) { gctl_error(req, "%d geom '%s'", EEXIST, pp->name); -- 2.45.0