diff --git a/sys/geom/cache/g_cache.c b/sys/geom/cache/g_cache.c index 1025eb24f70b..f20ee9d4368a 100644 --- a/sys/geom/cache/g_cache.c +++ b/sys/geom/cache/g_cache.c @@ -762,8 +762,8 @@ g_cache_ctl_create(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg1' argument"); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL) { G_CACHE_DEBUG(1, "Provider %s is invalid.", name); diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c index ddf9e13d47bc..8e5f3c551dd0 100644 --- a/sys/geom/concat/g_concat.c +++ b/sys/geom/concat/g_concat.c @@ -845,8 +845,8 @@ g_concat_ctl_create(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%u' argument.", no); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL) { G_CONCAT_DEBUG(1, "Disk %s is invalid.", name); @@ -871,8 +871,8 @@ g_concat_ctl_create(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%d' argument.", no); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); KASSERT(pp != NULL, ("Provider %s disappear?!", name)); if (g_concat_add_disk(sc, pp, no - 1) != 0) { diff --git a/sys/geom/eli/g_eli_ctl.c b/sys/geom/eli/g_eli_ctl.c index 0a8aea90afa0..ccfdb3aa5119 100644 --- a/sys/geom/eli/g_eli_ctl.c +++ b/sys/geom/eli/g_eli_ctl.c @@ -120,8 +120,8 @@ g_eli_ctl_attach(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%u' argument.", 0); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL) { gctl_error(req, "Provider %s is invalid.", name); @@ -186,8 +186,8 @@ g_eli_find_device(struct g_class *mp, const char *prov) struct g_provider *pp; struct g_consumer *cp; - if (strncmp(prov, "/dev/", strlen("/dev/")) == 0) - prov += strlen("/dev/"); + if (strncmp(prov, _PATH_DEV, strlen(_PATH_DEV)) == 0) + prov += strlen(_PATH_DEV); LIST_FOREACH(gp, &mp->geom, geom) { sc = gp->softc; if (sc == NULL) @@ -373,8 +373,8 @@ g_eli_ctl_onetime(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%u' argument.", 0); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL) { gctl_error(req, "Provider %s is invalid.", name); diff --git a/sys/geom/geom.h b/sys/geom/geom.h index f0627bbeef9c..46ec01e6c94a 100644 --- a/sys/geom/geom.h +++ b/sys/geom/geom.h @@ -419,6 +419,10 @@ g_free(void *ptr) int g_is_geom_thread(struct thread *td); +#ifndef _PATH_DEV +#define _PATH_DEV "/dev/" +#endif + #endif /* _KERNEL */ /* geom_ctl.c */ diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index da1d2d09c7c9..e8de1f81475b 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -166,7 +166,7 @@ init_dumpdev(struct cdev *dev) { struct diocskerneldump_arg kda; struct g_consumer *cp; - const char *devprefix = "/dev/", *devname; + const char *devprefix = _PATH_DEV, *devname; int error; size_t len; diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index eb3bc9af4153..92090ba8355b 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -760,10 +760,6 @@ g_resize_provider(struct g_provider *pp, off_t size) g_post_event(g_resize_provider_event, hh, M_WAITOK, NULL); } -#ifndef _PATH_DEV -#define _PATH_DEV "/dev/" -#endif - struct g_provider * g_provider_by_name(char const *arg) { diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index 7b9b81337006..894ba26d9854 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -2511,7 +2511,7 @@ g_journal_find_device(struct g_class *mp, const char *name) struct g_geom *gp; struct g_provider *pp; - if (strncmp(name, "/dev/", 5) == 0) + if (strncmp(name, _PATH_DEV, 5) == 0) name += 5; LIST_FOREACH(gp, &mp->geom, geom) { sc = gp->softc; diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c index d45b847130f4..b418451b82c1 100644 --- a/sys/geom/label/g_label.c +++ b/sys/geom/label/g_label.c @@ -442,8 +442,8 @@ g_label_ctl_create(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%d' argument", 1); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL) { G_LABEL_DEBUG(1, "Provider %s is invalid.", name); @@ -467,8 +467,8 @@ g_label_skip_dir(const char *name) char path[64]; u_int i; - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); if (strncmp(name, G_LABEL_DIR "/", strlen(G_LABEL_DIR "/")) == 0) name += strlen(G_LABEL_DIR "/"); for (i = 0; g_labels[i] != NULL; i++) { diff --git a/sys/geom/mirror/g_mirror_ctl.c b/sys/geom/mirror/g_mirror_ctl.c index 22c87aaa3951..60e46d8c903e 100644 --- a/sys/geom/mirror/g_mirror_ctl.c +++ b/sys/geom/mirror/g_mirror_ctl.c @@ -131,7 +131,7 @@ g_mirror_find_disk(struct g_mirror_softc *sc, const char *name) struct g_mirror_disk *disk; sx_assert(&sc->sc_lock, SX_XLOCKED); - if (strncmp(name, "/dev/", 5) == 0) + if (strncmp(name, _PATH_DEV, 5) == 0) name += 5; LIST_FOREACH(disk, &sc->sc_disks, d_next) { if (disk->d_consumer == NULL) @@ -450,8 +450,8 @@ g_mirror_ctl_create(struct gctl_req *req, struct g_class *mp) g_topology_unlock(); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL) { G_MIRROR_DEBUG(1, "Disk %s is invalid.", name); @@ -501,8 +501,8 @@ g_mirror_ctl_create(struct gctl_req *req, struct g_class *mp) for (attached = 0, no = 1; no < *nargs; no++) { snprintf(param, sizeof(param), "arg%u", no); name = gctl_get_asciiparam(req, param); - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL) { G_MIRROR_DEBUG(1, "Provider %s disappear?!", name); @@ -686,7 +686,7 @@ g_mirror_ctl_insert(struct gctl_req *req, struct g_class *mp) gctl_error(req, "Provider %s already inserted.", name); continue; } - if (strncmp(name, "/dev/", 5) == 0) + if (strncmp(name, _PATH_DEV, 5) == 0) name += 5; pp = g_provider_by_name(name); if (pp == NULL) { diff --git a/sys/geom/mountver/g_mountver.c b/sys/geom/mountver/g_mountver.c index 30374aad4ee4..c1ca84aa451a 100644 --- a/sys/geom/mountver/g_mountver.c +++ b/sys/geom/mountver/g_mountver.c @@ -426,8 +426,8 @@ g_mountver_ctl_create(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%d' argument", i); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL) { G_MOUNTVER_DEBUG(1, "Provider %s is invalid.", name); @@ -483,8 +483,8 @@ g_mountver_ctl_destroy(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%d' argument", i); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); gp = g_mountver_find_geom(mp, name); if (gp == NULL) { G_MOUNTVER_DEBUG(1, "Device %s is invalid.", name); diff --git a/sys/geom/multipath/g_multipath.c b/sys/geom/multipath/g_multipath.c index 5c9031e9d5bc..9b7845ab5256 100644 --- a/sys/geom/multipath/g_multipath.c +++ b/sys/geom/multipath/g_multipath.c @@ -944,7 +944,7 @@ g_multipath_ctl_add_name(struct gctl_req *req, struct g_class *mp, struct g_consumer *cp; struct g_provider *pp; const char *mpname; - static const char devpf[6] = "/dev/"; + static const char devpf[6] = _PATH_DEV; int error; g_topology_assert(); @@ -1007,7 +1007,7 @@ g_multipath_ctl_prefer(struct gctl_req *req, struct g_class *mp) struct g_multipath_softc *sc; struct g_consumer *cp; const char *name, *mpname; - static const char devpf[6] = "/dev/"; + static const char devpf[6] = _PATH_DEV; int *nargs; g_topology_assert(); diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c index a799cd761495..e0dd92ef20a1 100644 --- a/sys/geom/nop/g_nop.c +++ b/sys/geom/nop/g_nop.c @@ -676,8 +676,8 @@ g_nop_ctl_create(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%d' argument", i); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL) { G_NOP_DEBUG(1, "Provider %s is invalid.", name); @@ -787,8 +787,8 @@ g_nop_ctl_configure(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%d' argument", i); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL || pp->geom->class != mp) { G_NOP_DEBUG(1, "Provider %s is invalid.", name); @@ -857,8 +857,8 @@ g_nop_ctl_destroy(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%d' argument", i); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); gp = g_nop_find_geom(mp, name); if (gp == NULL) { G_NOP_DEBUG(1, "Device %s is invalid.", name); @@ -902,8 +902,8 @@ g_nop_ctl_reset(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%d' argument", i); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL || pp->geom->class != mp) { G_NOP_DEBUG(1, "Provider %s is invalid.", name); diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index 1619817e2793..fbee8c3f2bf0 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -50,10 +50,6 @@ __FBSDID("$FreeBSD$"); #include "g_part_if.h" -#ifndef _PATH_DEV -#define _PATH_DEV "/dev/" -#endif - static kobj_method_t g_part_null_methods[] = { { 0, 0 } }; diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c index e5c38a5b62bd..9558f313f62b 100644 --- a/sys/geom/raid/g_raid.c +++ b/sys/geom/raid/g_raid.c @@ -775,7 +775,7 @@ g_raid_open_consumer(struct g_raid_softc *sc, const char *name) g_topology_assert(); - if (strncmp(name, "/dev/", 5) == 0) + if (strncmp(name, _PATH_DEV, 5) == 0) name += 5; pp = g_provider_by_name(name); if (pp == NULL) diff --git a/sys/geom/raid/md_ddf.c b/sys/geom/raid/md_ddf.c index 3d3e460d1eb2..db919d96fa0b 100644 --- a/sys/geom/raid/md_ddf.c +++ b/sys/geom/raid/md_ddf.c @@ -2618,7 +2618,7 @@ g_raid_md_ctl_ddf(struct g_raid_md_object *md, error = -2; break; } - if (strncmp(diskname, "/dev/", 5) == 0) + if (strncmp(diskname, _PATH_DEV, 5) == 0) diskname += 5; TAILQ_FOREACH(disk, &sc->sc_disks, d_next) { diff --git a/sys/geom/raid/md_intel.c b/sys/geom/raid/md_intel.c index 50bd6c76d058..634ea30fbfe5 100644 --- a/sys/geom/raid/md_intel.c +++ b/sys/geom/raid/md_intel.c @@ -2208,7 +2208,7 @@ g_raid_md_ctl_intel(struct g_raid_md_object *md, error = -2; break; } - if (strncmp(diskname, "/dev/", 5) == 0) + if (strncmp(diskname, _PATH_DEV, 5) == 0) diskname += 5; TAILQ_FOREACH(disk, &sc->sc_disks, d_next) { diff --git a/sys/geom/raid/md_jmicron.c b/sys/geom/raid/md_jmicron.c index 236ac6e02bad..8f844b58a849 100644 --- a/sys/geom/raid/md_jmicron.c +++ b/sys/geom/raid/md_jmicron.c @@ -1268,7 +1268,7 @@ g_raid_md_ctl_jmicron(struct g_raid_md_object *md, error = -2; break; } - if (strncmp(diskname, "/dev/", 5) == 0) + if (strncmp(diskname, _PATH_DEV, 5) == 0) diskname += 5; TAILQ_FOREACH(disk, &sc->sc_disks, d_next) { diff --git a/sys/geom/raid/md_nvidia.c b/sys/geom/raid/md_nvidia.c index 0aacbd47962f..fb7f7253de41 100644 --- a/sys/geom/raid/md_nvidia.c +++ b/sys/geom/raid/md_nvidia.c @@ -1273,7 +1273,7 @@ g_raid_md_ctl_nvidia(struct g_raid_md_object *md, error = -2; break; } - if (strncmp(diskname, "/dev/", 5) == 0) + if (strncmp(diskname, _PATH_DEV, 5) == 0) diskname += 5; TAILQ_FOREACH(disk, &sc->sc_disks, d_next) { diff --git a/sys/geom/raid/md_promise.c b/sys/geom/raid/md_promise.c index f0708111e0ac..898b67590eb5 100644 --- a/sys/geom/raid/md_promise.c +++ b/sys/geom/raid/md_promise.c @@ -1609,7 +1609,7 @@ g_raid_md_ctl_promise(struct g_raid_md_object *md, error = -2; break; } - if (strncmp(diskname, "/dev/", 5) == 0) + if (strncmp(diskname, _PATH_DEV, 5) == 0) diskname += 5; TAILQ_FOREACH(disk, &sc->sc_disks, d_next) { diff --git a/sys/geom/raid/md_sii.c b/sys/geom/raid/md_sii.c index b54c97a30419..fbc9b1ae85e8 100644 --- a/sys/geom/raid/md_sii.c +++ b/sys/geom/raid/md_sii.c @@ -1355,7 +1355,7 @@ g_raid_md_ctl_sii(struct g_raid_md_object *md, error = -2; break; } - if (strncmp(diskname, "/dev/", 5) == 0) + if (strncmp(diskname, _PATH_DEV, 5) == 0) diskname += 5; TAILQ_FOREACH(disk, &sc->sc_disks, d_next) { diff --git a/sys/geom/raid3/g_raid3_ctl.c b/sys/geom/raid3/g_raid3_ctl.c index 7e9387c833e5..9794f176470b 100644 --- a/sys/geom/raid3/g_raid3_ctl.c +++ b/sys/geom/raid3/g_raid3_ctl.c @@ -78,7 +78,7 @@ g_raid3_find_disk(struct g_raid3_softc *sc, const char *name) u_int n; sx_assert(&sc->sc_lock, SX_XLOCKED); - if (strncmp(name, "/dev/", 5) == 0) + if (strncmp(name, _PATH_DEV, 5) == 0) name += 5; for (n = 0; n < sc->sc_ndisks; n++) { disk = &sc->sc_disks[n]; @@ -431,7 +431,7 @@ g_raid3_ctl_insert(struct gctl_req *req, struct g_class *mp) no = gctl_get_paraml(req, "number", sizeof(*no)); else no = NULL; - if (strncmp(name, "/dev/", 5) == 0) + if (strncmp(name, _PATH_DEV, 5) == 0) name += 5; g_topology_lock(); pp = g_provider_by_name(name); diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c index 1eedee80552e..af764ee7453a 100644 --- a/sys/geom/stripe/g_stripe.c +++ b/sys/geom/stripe/g_stripe.c @@ -1096,8 +1096,8 @@ g_stripe_ctl_create(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%u' argument.", no); return; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); if (pp == NULL) { G_STRIPE_DEBUG(1, "Disk %s is invalid.", name); @@ -1122,8 +1122,8 @@ g_stripe_ctl_create(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%u' argument.", no); continue; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); pp = g_provider_by_name(name); KASSERT(pp != NULL, ("Provider %s disappear?!", name)); if (g_stripe_add_disk(sc, pp, no - 1) != 0) { diff --git a/sys/geom/vinum/geom_vinum_share.c b/sys/geom/vinum/geom_vinum_share.c index 5ca245a40554..feac8cf8f9b7 100644 --- a/sys/geom/vinum/geom_vinum_share.c +++ b/sys/geom/vinum/geom_vinum_share.c @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #define iswhite(c) (((c) == ' ') || ((c) == '\t')) #else #include +#include #include #include #include @@ -466,7 +467,7 @@ gv_new_drive(int max, char *token[]) } ptr = token[j]; - if (strncmp(ptr, "/dev/", 5) == 0) + if (strncmp(ptr, _PATH_DEV, 5) == 0) ptr += 5; strlcpy(d->device, ptr, sizeof(d->device)); } else { diff --git a/sys/geom/virstor/g_virstor.h b/sys/geom/virstor/g_virstor.h index 1bcd734a81e9..dfc1a98fcfec 100644 --- a/sys/geom/virstor/g_virstor.h +++ b/sys/geom/virstor/g_virstor.h @@ -112,8 +112,4 @@ struct g_virstor_bio_q { #endif /* _KERNEL */ -#ifndef _PATH_DEV -#define _PATH_DEV "/dev/" -#endif - #endif /* !_G_VIRSTOR_H_ */