diff options
| author | phk <phk@FreeBSD.org> | 2002-05-21 19:50:04 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-05-21 19:50:04 +0000 |
| commit | 8623a7bc17bf717c85ed19c0dcd320600b1360fb (patch) | |
| tree | be13846f2b1a245bfdcf4c7bba0be562dae554da | |
| parent | 37981f345cceca42470a26bc5c4164cbdbd630cb (diff) | |
| download | FreeBSD-src-8623a7bc17bf717c85ed19c0dcd320600b1360fb.zip FreeBSD-src-8623a7bc17bf717c85ed19c0dcd320600b1360fb.tar.gz | |
Remove the "-class" suffix from classes, they will not be ambiguous.
Sponsored by: DARPA & NAI Labs.
| -rw-r--r-- | sys/geom/geom_bsd.c | 2 | ||||
| -rw-r--r-- | sys/geom/geom_dev.c | 4 | ||||
| -rw-r--r-- | sys/geom/geom_disk.c | 2 | ||||
| -rw-r--r-- | sys/geom/geom_mbr.c | 4 | ||||
| -rw-r--r-- | sys/geom/geom_pc98.c | 2 | ||||
| -rw-r--r-- | sys/geom/geom_sunlabel.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/sys/geom/geom_bsd.c b/sys/geom/geom_bsd.c index b42bd37..9b94e45 100644 --- a/sys/geom/geom_bsd.c +++ b/sys/geom/geom_bsd.c @@ -57,7 +57,7 @@ #include <geom/geom.h> #include <geom/geom_slice.h> -#define BSD_CLASS_NAME "BSD-class" +#define BSD_CLASS_NAME "BSD" struct g_bsd_softc { off_t labeloffset; diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c index 0c34f7c..f3be90c 100644 --- a/sys/geom/geom_dev.c +++ b/sys/geom/geom_dev.c @@ -79,7 +79,7 @@ static g_taste_t g_dev_taste; static g_orphan_t g_dev_orphan; static struct g_class g_dev_class = { - "DEV-class", + "DEV", g_dev_taste, NULL, G_CLASS_INITSTUFF @@ -291,7 +291,7 @@ g_dev_ioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct thread *td) if (error != 0 && cmd == DIOCGDVIRGIN) { g_topology_lock(); - gp = g_create_geomf("BSD-class", cp->provider, NULL); + gp = g_create_geomf("BSD", cp->provider, NULL); g_topology_unlock(); } PICKUP_GIANT(); diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c index 6abb492..b843023 100644 --- a/sys/geom/geom_disk.c +++ b/sys/geom/geom_disk.c @@ -57,7 +57,7 @@ static g_access_t g_disk_access; struct g_class g_disk_class = { - "DISK-class", + "DISK", NULL, NULL, G_CLASS_INITSTUFF diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c index 0dc6c32..2143bf0 100644 --- a/sys/geom/geom_mbr.c +++ b/sys/geom/geom_mbr.c @@ -58,8 +58,8 @@ #include <geom/geom.h> #include <geom/geom_slice.h> -#define MBR_CLASS_NAME "MBR-class" -#define MBREXT_CLASS_NAME "MBREXT-class" +#define MBR_CLASS_NAME "MBR" +#define MBREXT_CLASS_NAME "MBREXT" static void g_dec_dos_partition(u_char *ptr, struct dos_partition *d) diff --git a/sys/geom/geom_pc98.c b/sys/geom/geom_pc98.c index a89bf36..12837b7 100644 --- a/sys/geom/geom_pc98.c +++ b/sys/geom/geom_pc98.c @@ -57,7 +57,7 @@ #include <geom/geom_slice.h> #include <machine/endian.h> -#define PC98_CLASS_NAME "PC98-class" +#define PC98_CLASS_NAME "PC98" struct g_pc98_softc { int foo; diff --git a/sys/geom/geom_sunlabel.c b/sys/geom/geom_sunlabel.c index 3363f4e..b966e5b 100644 --- a/sys/geom/geom_sunlabel.c +++ b/sys/geom/geom_sunlabel.c @@ -57,7 +57,7 @@ #include <geom/geom_slice.h> #include <machine/endian.h> -#define SUNLABEL_CLASS_NAME "SUNLABEL-class" +#define SUNLABEL_CLASS_NAME "SUN" struct g_sunlabel_softc { int foo; |
