Page MenuHomeFreeBSD
Files F132094313

D25565.id74090.diff
No OneTemporary
Actions

D25565.id74090.diff
View Options

Index: sys/geom/cache/g_cache.c
===================================================================
--- sys/geom/cache/g_cache.c
+++ sys/geom/cache/g_cache.c
@@ -762,8 +762,8 @@
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);
Index: sys/geom/concat/g_concat.c
===================================================================
--- sys/geom/concat/g_concat.c
+++ sys/geom/concat/g_concat.c
@@ -845,8 +845,8 @@
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 @@
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) {
Index: sys/geom/eli/g_eli_ctl.c
===================================================================
--- sys/geom/eli/g_eli_ctl.c
+++ sys/geom/eli/g_eli_ctl.c
@@ -120,8 +120,8 @@
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 @@
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 @@
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);
Index: sys/geom/geom.h
===================================================================
--- sys/geom/geom.h
+++ sys/geom/geom.h
@@ -419,6 +419,10 @@
int g_is_geom_thread(struct thread *td);
+#ifndef _PATH_DEV
+#define _PATH_DEV "/dev/"
+#endif
+
#endif /* _KERNEL */
/* geom_ctl.c */
Index: sys/geom/geom_dev.c
===================================================================
--- sys/geom/geom_dev.c
+++ sys/geom/geom_dev.c
@@ -166,7 +166,7 @@
{
struct diocskerneldump_arg kda;
struct g_consumer *cp;
- const char *devprefix = "/dev/", *devname;
+ const char *devprefix = _PATH_DEV, *devname;
int error;
size_t len;
Index: sys/geom/geom_subr.c
===================================================================
--- sys/geom/geom_subr.c
+++ sys/geom/geom_subr.c
@@ -760,10 +760,6 @@
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)
{
Index: sys/geom/journal/g_journal.c
===================================================================
--- sys/geom/journal/g_journal.c
+++ sys/geom/journal/g_journal.c
@@ -2511,7 +2511,7 @@
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;
Index: sys/geom/label/g_label.c
===================================================================
--- sys/geom/label/g_label.c
+++ sys/geom/label/g_label.c
@@ -442,8 +442,8 @@
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 @@
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++) {
Index: sys/geom/mirror/g_mirror_ctl.c
===================================================================
--- sys/geom/mirror/g_mirror_ctl.c
+++ sys/geom/mirror/g_mirror_ctl.c
@@ -131,7 +131,7 @@
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_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 @@
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 @@
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) {
Index: sys/geom/mountver/g_mountver.c
===================================================================
--- sys/geom/mountver/g_mountver.c
+++ sys/geom/mountver/g_mountver.c
@@ -426,8 +426,8 @@
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 @@
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);
Index: sys/geom/multipath/g_multipath.c
===================================================================
--- sys/geom/multipath/g_multipath.c
+++ sys/geom/multipath/g_multipath.c
@@ -944,7 +944,7 @@
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 @@
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();
Index: sys/geom/nop/g_nop.c
===================================================================
--- sys/geom/nop/g_nop.c
+++ sys/geom/nop/g_nop.c
@@ -676,8 +676,8 @@
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 @@
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 @@
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 @@
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);
Index: sys/geom/part/g_part.c
===================================================================
--- sys/geom/part/g_part.c
+++ sys/geom/part/g_part.c
@@ -50,10 +50,6 @@
#include "g_part_if.h"
-#ifndef _PATH_DEV
-#define _PATH_DEV "/dev/"
-#endif
-
static kobj_method_t g_part_null_methods[] = {
{ 0, 0 }
};
Index: sys/geom/raid/g_raid.c
===================================================================
--- sys/geom/raid/g_raid.c
+++ sys/geom/raid/g_raid.c
@@ -775,7 +775,7 @@
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)
Index: sys/geom/raid/md_ddf.c
===================================================================
--- sys/geom/raid/md_ddf.c
+++ sys/geom/raid/md_ddf.c
@@ -2618,7 +2618,7 @@
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) {
Index: sys/geom/raid/md_intel.c
===================================================================
--- sys/geom/raid/md_intel.c
+++ sys/geom/raid/md_intel.c
@@ -2208,7 +2208,7 @@
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) {
Index: sys/geom/raid/md_jmicron.c
===================================================================
--- sys/geom/raid/md_jmicron.c
+++ sys/geom/raid/md_jmicron.c
@@ -1268,7 +1268,7 @@
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) {
Index: sys/geom/raid/md_nvidia.c
===================================================================
--- sys/geom/raid/md_nvidia.c
+++ sys/geom/raid/md_nvidia.c
@@ -1273,7 +1273,7 @@
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) {
Index: sys/geom/raid/md_promise.c
===================================================================
--- sys/geom/raid/md_promise.c
+++ sys/geom/raid/md_promise.c
@@ -1609,7 +1609,7 @@
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) {
Index: sys/geom/raid/md_sii.c
===================================================================
--- sys/geom/raid/md_sii.c
+++ sys/geom/raid/md_sii.c
@@ -1355,7 +1355,7 @@
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) {
Index: sys/geom/raid3/g_raid3_ctl.c
===================================================================
--- sys/geom/raid3/g_raid3_ctl.c
+++ sys/geom/raid3/g_raid3_ctl.c
@@ -78,7 +78,7 @@
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 @@
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);
Index: sys/geom/stripe/g_stripe.c
===================================================================
--- sys/geom/stripe/g_stripe.c
+++ sys/geom/stripe/g_stripe.c
@@ -1096,8 +1096,8 @@
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 @@
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) {
Index: sys/geom/vinum/geom_vinum_share.c
===================================================================
--- sys/geom/vinum/geom_vinum_share.c
+++ sys/geom/vinum/geom_vinum_share.c
@@ -54,6 +54,7 @@
#define iswhite(c) (((c) == ' ') || ((c) == '\t'))
#else
#include <ctype.h>
+#include <paths.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -466,7 +467,7 @@
}
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 {
Index: sys/geom/virstor/g_virstor.h
===================================================================
--- sys/geom/virstor/g_virstor.h
+++ sys/geom/virstor/g_virstor.h
@@ -112,8 +112,4 @@
#endif /* _KERNEL */
-#ifndef _PATH_DEV
-#define _PATH_DEV "/dev/"
-#endif
-
#endif /* !_G_VIRSTOR_H_ */

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 14, 3:19 PM (12 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23725878
Default Alt Text
D25565.id74090.diff (14 KB)

Event Timeline