Remove the "-class" suffix from classes, they will not be ambiguous.
Sponsored by: DARPA & NAI Labs.
This commit is contained in:
parent
db40007d42
commit
3abe4a80a5
@ -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;
|
||||
|
@ -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();
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user