d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sys/geom: consistently use _PATH_DEV instead of hardcoding "/dev/".

Browse Source 
Reviewed by:	cem
MFC after:	2 weeks
Differential Revision:	https://reviews.freebsd.org/D25565
This commit is contained in:
Xin LI 2020-07-09 02:52:39 +00:00
parent d371ed1c4b
commit 8510f61acd
24 changed files with 57 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/geom/cache/g_cache.c vendored
View File

@ -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);

8
sys/geom/concat/g_concat.c
View File

@ -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) {

12
sys/geom/eli/g_eli_ctl.c
View File

@ -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);

4
sys/geom/geom.h
View File

@ -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 */

2
sys/geom/geom_dev.c
View File

@ -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;

4
sys/geom/geom_subr.c
View File

@ -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)
{

2
sys/geom/journal/g_journal.c
View File

@ -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;

8
sys/geom/label/g_label.c
View File

@ -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++) {

12
sys/geom/mirror/g_mirror_ctl.c
View File

@ -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 @@ err:
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 @@ err2:
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) {

8
sys/geom/mountver/g_mountver.c
View File

@ -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);

4
sys/geom/multipath/g_multipath.c
View File

@ -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();

16
sys/geom/nop/g_nop.c
View File

@ -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);

4
sys/geom/part/g_part.c
View File

@ -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 }
};

2
sys/geom/raid/g_raid.c
View File

@ -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)

2
sys/geom/raid/md_ddf.c
View File

@ -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) {

2
sys/geom/raid/md_intel.c
View File

@ -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) {

2
sys/geom/raid/md_jmicron.c
View File

@ -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) {

2
sys/geom/raid/md_nvidia.c
View File

@ -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) {

2
sys/geom/raid/md_promise.c
View File

@ -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) {

2
sys/geom/raid/md_sii.c
View File

@ -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) {

4
sys/geom/raid3/g_raid3_ctl.c
View File

@ -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);

8
sys/geom/stripe/g_stripe.c
View File

@ -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) {

3
sys/geom/vinum/geom_vinum_share.c
View File

@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
#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 @@ 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 {

4
sys/geom/virstor/g_virstor.h
View File

@ -112,8 +112,4 @@ struct g_virstor_bio_q {
#endif /* _KERNEL */
#ifndef _PATH_DEV
#define _PATH_DEV "/dev/"
#endif
#endif /* !_G_VIRSTOR_H_ */