call g_new_provider instead for callers that pass a regular string to g_new_providerf

Signed-off-by: Wuyang Chung <[email protected]>

Author: wy-chung

sys/geom/gate/g_gate.c

@@ -598,7 +598,7 @@ g_gate_create(struct g_gate_ctl_create *ggio)
 
 	ggio->gctl_unit = sc->sc_unit;
 
-	pp = g_new_providerf(gp, "%s", name);
+	pp = g_new_provider(gp, name);
 	pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
 	pp->mediasize = ggio->gctl_mediasize;
 	pp->sectorsize = ggio->gctl_sectorsize;

sys/geom/geom_ccd.c

@@ -819,7 +819,7 @@ g_ccd_create(struct gctl_req *req, struct g_class *mp)
 		return;
 	}
 
-	pp = g_new_providerf(gp, "%s", gp->name);
+	pp = g_new_provider(gp, gp->name);
 	pp->mediasize = sc->sc_size * (off_t)sc->sc_secsize;
 	pp->sectorsize = sc->sc_secsize;
 	g_error_provider(pp, 0);

sys/geom/geom_disk.c

@@ -728,7 +728,7 @@ g_disk_create(void *arg, int flag)
 	sc->d_devstat = dp->d_devstat;
 	gp = g_new_geomf(&g_disk_class, "%s%d", dp->d_name, dp->d_unit);
 	gp->softc = sc;
-	pp = g_new_providerf(gp, "%s", gp->name);
+	pp = g_new_provider(gp, gp->name);
 	LIST_FOREACH(dap, &dp->d_aliases, da_next)
 		g_provider_add_alias(pp, "%s%d", dap->da_alias, dp->d_unit);
 	devstat_remove_entry(pp->stat);

sys/geom/geom_slice.c

@@ -404,7 +404,7 @@ g_slice_config(struct g_geom *gp, u_int idx, int how, off_t offset, off_t length
 	sbuf_vprintf(sb, fmt, ap);
 	va_end(ap);
 	sbuf_finish(sb);
-	pp = g_new_providerf(gp, "%s", sbuf_data(sb));
+	pp = g_new_provider(gp, sbuf_data(sb));
 	pp2 = LIST_FIRST(&gp->consumer)->provider;
 	pp->stripesize = pp2->stripesize;
 	pp->stripeoffset = pp2->stripeoffset + offset;

sys/geom/geom_subr.c

@@ -611,7 +611,7 @@ g_new_provider(struct g_geom *gp, const char *name)
 	    ("new provider on WITHERing geom(%s) (class %s)",
 	    gp->name, gp->class->name));
 	len = strlen(name);
-	pp = g_malloc(sizeof *pp + len + 1, M_WAITOK | M_ZERO);
+	pp = g_malloc(sizeof(*pp) + len + 1, M_WAITOK | M_ZERO);
 	pp->name = (char *)(pp + 1);
 	memcpy(pp->name, name, len);
 	LIST_INIT(&pp->consumers);

sys/geom/mountver/g_mountver.c

@@ -303,7 +303,7 @@ g_mountver_create(struct gctl_req *req, struct g_class *mp, struct g_provider *p
 	gp->access = g_mountver_access;
 	gp->dumpconf = g_mountver_dumpconf;
 
-	newpp = g_new_providerf(gp, "%s", gp->name);
+	newpp = g_new_provider(gp, gp->name);
 	newpp->mediasize = pp->mediasize;
 	newpp->sectorsize = pp->sectorsize;
 	newpp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;

sys/geom/nop/g_nop.c

@@ -448,7 +448,7 @@ g_nop_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp,
 	mtx_init(&sc->sc_lock, "gnop lock", NULL, MTX_DEF);
 	gp->softc = sc;
 
-	newpp = g_new_providerf(gp, "%s", gp->name);
+	newpp = g_new_provider(gp, gp->name);
 	newpp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
 	newpp->mediasize = size;
 	newpp->sectorsize = secsize;

sys/geom/part/g_part_if.m

@@ -61,7 +61,7 @@
 		sb = sbuf_new_auto();
 		G_PART_FULLNAME(table, entry, sb, pfx);
 		sbuf_finish(sb);
-		ret = g_new_providerf(gp, "%s", sbuf_data(sb));
+		ret = g_new_provider(gp, sbuf_data(sb));
 		sbuf_delete(sb);
 		return (ret);
 	}

sys/geom/raid/g_raid.c

@@ -1634,7 +1634,7 @@ g_raid_launch_provider(struct g_raid_volume *vol)
 		snprintf(name, sizeof(name), "raid/r%d", vol->v_global_id);
 	}
 
-	pp = g_new_providerf(sc->sc_geom, "%s", name);
+	pp = g_new_provider(sc->sc_geom, name);
 	pp->flags |= G_PF_DIRECT_RECEIVE;
 	if (vol->v_tr->tro_class->trc_accept_unmapped) {
 		pp->flags |= G_PF_ACCEPT_UNMAPPED;

sys/geom/union/g_union.c

@@ -267,7 +267,7 @@ g_union_ctl_create(struct gctl_req *req, struct g_class *mp, bool verbose)
 	sc->sc_writemap_memory = 0;
 	gp->softc = sc;
 
-	newpp = g_new_providerf(gp, "%s", gp->name);
+	newpp = g_new_provider(gp, gp->name);
 	newpp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
 	newpp->mediasize = size;
 	newpp->sectorsize = secsize;