From 0e11f0a93b301f7cf608ac6cc80f77fa75314bdb Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Mon, 7 Jun 2004 13:33:09 +0000 Subject: [PATCH] Don't allow for duplicated entries creation. --- sys/geom/nop/g_nop.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c index df666bf665a..52f454943e5 100644 --- a/sys/geom/nop/g_nop.c +++ b/sys/geom/nop/g_nop.c @@ -124,6 +124,7 @@ g_nop_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp, struct g_geom *gp; struct g_provider *newpp; struct g_consumer *cp; + char name[64]; int error; g_topology_assert(); @@ -132,10 +133,16 @@ g_nop_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp, newpp = NULL; cp = NULL; - gp = g_new_geomf(mp, "%s%s", pp->name, G_NOP_SUFFIX); + snprintf(name, sizeof(name), "%s%s", pp->name, G_NOP_SUFFIX); + LIST_FOREACH(gp, &mp->geom, geom) { + if (strcmp(gp->name, name) == 0) { + gctl_error(req, "Provider %s already exists.", name); + return (EEXIST); + } + } + gp = g_new_geomf(mp, name); if (gp == NULL) { - gctl_error(req, "Cannot create geom %s%s.", pp->name, - G_NOP_SUFFIX); + gctl_error(req, "Cannot create geom %s%s.", name); return (ENOMEM); } gp->softc = NULL; @@ -147,8 +154,7 @@ g_nop_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp, newpp = g_new_providerf(gp, gp->name); if (newpp == NULL) { - gctl_error(req, "Cannot create provider %s%s.", pp->name, - G_NOP_SUFFIX); + gctl_error(req, "Cannot create provider %s%s.", name); error = ENOMEM; goto fail; }