Skip to content

Commit 19d559b

Browse files
committed
call g_new_provider instead for callers that pass a regular string to g_new_providerf
1 parent 8b11286 commit 19d559b

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

sys/geom/gate/g_gate.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ g_gate_create(struct g_gate_ctl_create *ggio)
598598

599599
ggio->gctl_unit = sc->sc_unit;
600600

601-
pp = g_new_providerf(gp, "%s", name);
601+
pp = g_new_provider(gp, name);
602602
pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
603603
pp->mediasize = ggio->gctl_mediasize;
604604
pp->sectorsize = ggio->gctl_sectorsize;

sys/geom/geom_ccd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ g_ccd_create(struct gctl_req *req, struct g_class *mp)
819819
return;
820820
}
821821

822-
pp = g_new_providerf(gp, "%s", gp->name);
822+
pp = g_new_provider(gp, gp->name);
823823
pp->mediasize = sc->sc_size * (off_t)sc->sc_secsize;
824824
pp->sectorsize = sc->sc_secsize;
825825
g_error_provider(pp, 0);

sys/geom/geom_disk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ g_disk_create(void *arg, int flag)
728728
sc->d_devstat = dp->d_devstat;
729729
gp = g_new_geomf(&g_disk_class, "%s%d", dp->d_name, dp->d_unit);
730730
gp->softc = sc;
731-
pp = g_new_providerf(gp, "%s", gp->name);
731+
pp = g_new_provider(gp, gp->name);
732732
LIST_FOREACH(dap, &dp->d_aliases, da_next)
733733
g_provider_add_alias(pp, "%s%d", dap->da_alias, dp->d_unit);
734734
devstat_remove_entry(pp->stat);

sys/geom/geom_slice.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ g_slice_config(struct g_geom *gp, u_int idx, int how, off_t offset, off_t length
404404
sbuf_vprintf(sb, fmt, ap);
405405
va_end(ap);
406406
sbuf_finish(sb);
407-
pp = g_new_providerf(gp, "%s", sbuf_data(sb));
407+
pp = g_new_provider(gp, sbuf_data(sb));
408408
pp2 = LIST_FIRST(&gp->consumer)->provider;
409409
pp->stripesize = pp2->stripesize;
410410
pp->stripeoffset = pp2->stripeoffset + offset;

sys/geom/mountver/g_mountver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ g_mountver_create(struct gctl_req *req, struct g_class *mp, struct g_provider *p
303303
gp->access = g_mountver_access;
304304
gp->dumpconf = g_mountver_dumpconf;
305305

306-
newpp = g_new_providerf(gp, "%s", gp->name);
306+
newpp = g_new_provider(gp, gp->name);
307307
newpp->mediasize = pp->mediasize;
308308
newpp->sectorsize = pp->sectorsize;
309309
newpp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;

sys/geom/nop/g_nop.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ g_nop_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp,
448448
mtx_init(&sc->sc_lock, "gnop lock", NULL, MTX_DEF);
449449
gp->softc = sc;
450450

451-
newpp = g_new_providerf(gp, "%s", gp->name);
451+
newpp = g_new_provider(gp, gp->name);
452452
newpp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
453453
newpp->mediasize = size;
454454
newpp->sectorsize = secsize;

sys/geom/part/g_part_if.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
sb = sbuf_new_auto();
6262
G_PART_FULLNAME(table, entry, sb, pfx);
6363
sbuf_finish(sb);
64-
ret = g_new_providerf(gp, "%s", sbuf_data(sb));
64+
ret = g_new_provider(gp, sbuf_data(sb));
6565
sbuf_delete(sb);
6666
return (ret);
6767
}

sys/geom/raid/g_raid.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,7 @@ g_raid_launch_provider(struct g_raid_volume *vol)
16341634
snprintf(name, sizeof(name), "raid/r%d", vol->v_global_id);
16351635
}
16361636

1637-
pp = g_new_providerf(sc->sc_geom, "%s", name);
1637+
pp = g_new_provider(sc->sc_geom, name);
16381638
pp->flags |= G_PF_DIRECT_RECEIVE;
16391639
if (vol->v_tr->tro_class->trc_accept_unmapped) {
16401640
pp->flags |= G_PF_ACCEPT_UNMAPPED;

sys/geom/union/g_union.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ g_union_ctl_create(struct gctl_req *req, struct g_class *mp, bool verbose)
267267
sc->sc_writemap_memory = 0;
268268
gp->softc = sc;
269269

270-
newpp = g_new_providerf(gp, "%s", gp->name);
270+
newpp = g_new_provider(gp, gp->name);
271271
newpp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
272272
newpp->mediasize = size;
273273
newpp->sectorsize = secsize;

sys/geom/uzip/g_uzip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ g_uzip_taste(struct g_class *mp, struct g_provider *pp, int flags)
904904
}
905905

906906
g_topology_lock();
907-
pp2 = g_new_providerf(gp, "%s", gp->name);
907+
pp2 = g_new_provider(gp, gp->name);
908908
pp2->sectorsize = 512;
909909
pp2->mediasize = (off_t)sc->nblocks * sc->blksz;
910910
pp2->stripesize = pp->stripesize;

0 commit comments

Comments
 (0)