Tag all geom classes in the tree with a version number.
This commit is contained in:
parent
7acae2155e
commit
5721c9c76a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=133318
@ -98,6 +98,10 @@ static u_int32_t acd_lun_map = 0;
|
||||
static MALLOC_DEFINE(M_ACD, "ACD driver", "ATAPI CD driver buffers");
|
||||
static struct g_class acd_class = {
|
||||
.name = "ACD",
|
||||
.version = G_VERSION,
|
||||
.access = acd_geom_access,
|
||||
.ioctl = acd_geom_ioctl,
|
||||
.start = acd_geom_start,
|
||||
};
|
||||
DECLARE_GEOM_CLASS(acd_class, acd);
|
||||
|
||||
@ -249,9 +253,6 @@ acd_geom_create(void *arg, int flag)
|
||||
cdp = arg;
|
||||
g_topology_assert();
|
||||
gp = g_new_geomf(&acd_class, "acd%d", cdp->lun);
|
||||
gp->access = acd_geom_access;
|
||||
gp->ioctl = acd_geom_ioctl;
|
||||
gp->start = acd_geom_start;
|
||||
gp->softc = cdp;
|
||||
cdp->gp = gp;
|
||||
pp = g_new_providerf(gp, "acd%d", cdp->lun);
|
||||
|
@ -123,6 +123,7 @@ static struct cdevsw mdctl_cdevsw = {
|
||||
|
||||
struct g_class g_md_class = {
|
||||
.name = "MD",
|
||||
.version = G_VERSION,
|
||||
.init = g_md_init,
|
||||
.fini = g_md_fini,
|
||||
.start = g_md_start,
|
||||
|
@ -272,6 +272,7 @@ g_bde_ctlreq(struct gctl_req *req, struct g_class *mp, char const *verb)
|
||||
|
||||
static struct g_class g_bde_class = {
|
||||
.name = BDE_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.destroy_geom = g_bde_destroy_geom,
|
||||
.ctlreq = g_bde_ctlreq,
|
||||
.start = g_bde_start,
|
||||
|
@ -58,6 +58,7 @@ static g_dumpconf_t g_concat_dumpconf;
|
||||
|
||||
struct g_class g_concat_class = {
|
||||
.name = G_CONCAT_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.ctlreq = g_concat_config,
|
||||
.taste = g_concat_taste,
|
||||
.destroy_geom = g_concat_destroy_geom
|
||||
|
@ -60,6 +60,7 @@ static int g_gate_destroy_geom(struct gctl_req *, struct g_class *,
|
||||
struct g_geom *);
|
||||
struct g_class g_gate_class = {
|
||||
.name = G_GATE_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.destroy_geom = g_gate_destroy_geom
|
||||
};
|
||||
|
||||
|
@ -364,6 +364,7 @@ g_aes_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
|
||||
|
||||
static struct g_class g_aes_class = {
|
||||
.name = AES_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.taste = g_aes_taste,
|
||||
.start = g_aes_start,
|
||||
.orphan = g_aes_orphan,
|
||||
|
@ -255,6 +255,7 @@ g_apple_taste(struct g_class *mp, struct g_provider *pp, int insist)
|
||||
|
||||
static struct g_class g_apple_class = {
|
||||
.name = APPLE_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.taste = g_apple_taste,
|
||||
.dumpconf = g_apple_dumpconf,
|
||||
};
|
||||
|
@ -662,6 +662,7 @@ g_bsd_config(struct gctl_req *req, struct g_class *mp, char const *verb)
|
||||
/* Finally, register with GEOM infrastructure. */
|
||||
static struct g_class g_bsd_class = {
|
||||
.name = BSD_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.taste = g_bsd_taste,
|
||||
.ctlreq = g_bsd_config,
|
||||
.dumpconf = g_bsd_dumpconf,
|
||||
|
@ -858,6 +858,7 @@ g_ccd_config(struct gctl_req *req, struct g_class *mp, char const *verb)
|
||||
|
||||
static struct g_class g_ccd_class = {
|
||||
.name = "CCD",
|
||||
.version = G_VERSION,
|
||||
.ctlreq = g_ccd_config,
|
||||
.destroy_geom = g_ccd_destroy_geom,
|
||||
.start = g_ccd_start,
|
||||
|
@ -76,6 +76,7 @@ static g_orphan_t g_dev_orphan;
|
||||
|
||||
static struct g_class g_dev_class = {
|
||||
.name = "DEV",
|
||||
.version = G_VERSION,
|
||||
.taste = g_dev_taste,
|
||||
.orphan = g_dev_orphan,
|
||||
};
|
||||
|
@ -67,6 +67,7 @@ static g_dumpconf_t g_disk_dumpconf;
|
||||
|
||||
struct g_class g_disk_class = {
|
||||
.name = "DISK",
|
||||
.version = G_VERSION,
|
||||
.init = g_disk_init,
|
||||
.fini = g_disk_fini,
|
||||
.start = g_disk_start,
|
||||
|
@ -460,6 +460,7 @@ g_fox_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp)
|
||||
|
||||
static struct g_class g_fox_class = {
|
||||
.name = FOX_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.taste = g_fox_taste,
|
||||
.destroy_geom = g_fox_destroy_geom,
|
||||
.start = g_fox_start,
|
||||
|
@ -229,6 +229,7 @@ g_gpt_taste(struct g_class *mp, struct g_provider *pp, int insist)
|
||||
|
||||
static struct g_class g_gpt_class = {
|
||||
.name = "GPT",
|
||||
.version = G_VERSION,
|
||||
.taste = g_gpt_taste,
|
||||
.dumpconf = g_gpt_dumpconf,
|
||||
};
|
||||
|
@ -276,6 +276,7 @@ g_mbr_taste(struct g_class *mp, struct g_provider *pp, int insist)
|
||||
|
||||
static struct g_class g_mbr_class = {
|
||||
.name = MBR_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.taste = g_mbr_taste,
|
||||
.dumpconf = g_mbr_dumpconf,
|
||||
.ioctl = g_mbr_ioctl,
|
||||
@ -418,6 +419,7 @@ g_mbrext_taste(struct g_class *mp, struct g_provider *pp, int insist __unused)
|
||||
|
||||
static struct g_class g_mbrext_class = {
|
||||
.name = MBREXT_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.taste = g_mbrext_taste,
|
||||
.dumpconf = g_mbrext_dumpconf,
|
||||
};
|
||||
|
@ -281,6 +281,7 @@ g_pc98_taste(struct g_class *mp, struct g_provider *pp, int flags)
|
||||
|
||||
static struct g_class g_pc98_class = {
|
||||
.name = PC98_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.taste = g_pc98_taste,
|
||||
.dumpconf = g_pc98_dumpconf,
|
||||
.ioctl = g_pc98_ioctl,
|
||||
|
@ -273,6 +273,7 @@ g_sunlabel_taste(struct g_class *mp, struct g_provider *pp, int flags)
|
||||
|
||||
static struct g_class g_sunlabel_class = {
|
||||
.name = SUNLABEL_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.taste = g_sunlabel_taste,
|
||||
.ctlreq = g_sunlabel_config,
|
||||
.dumpconf = g_sunlabel_dumpconf,
|
||||
|
@ -137,6 +137,8 @@ g_vol_ffs_taste(struct g_class *mp, struct g_provider *pp, int flags)
|
||||
|
||||
static struct g_class g_vol_ffs_class = {
|
||||
.name = VOL_FFS_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.version = G_VERSION,
|
||||
.taste = g_vol_ffs_taste,
|
||||
};
|
||||
|
||||
|
@ -55,6 +55,7 @@ static void g_label_config(struct gctl_req *req, struct g_class *mp,
|
||||
|
||||
struct g_class g_label_class = {
|
||||
.name = G_LABEL_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.ctlreq = g_label_config,
|
||||
.taste = g_label_taste
|
||||
};
|
||||
|
@ -81,6 +81,7 @@ static g_taste_t g_mirror_taste;
|
||||
|
||||
struct g_class g_mirror_class = {
|
||||
.name = G_MIRROR_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.ctlreq = g_mirror_config,
|
||||
.taste = g_mirror_taste,
|
||||
.destroy_geom = g_mirror_destroy_geom
|
||||
|
@ -56,6 +56,7 @@ static void g_nop_dumpconf(struct sbuf *sb, const char *indent,
|
||||
|
||||
struct g_class g_nop_class = {
|
||||
.name = G_NOP_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.ctlreq = g_nop_config,
|
||||
.destroy_geom = g_nop_destroy_geom
|
||||
};
|
||||
|
@ -58,6 +58,7 @@ static g_fini_t g_stripe_fini;
|
||||
|
||||
struct g_class g_stripe_class = {
|
||||
.name = G_STRIPE_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.ctlreq = g_stripe_config,
|
||||
.taste = g_stripe_taste,
|
||||
.destroy_geom = g_stripe_destroy_geom,
|
||||
|
@ -623,6 +623,7 @@ gv_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp)
|
||||
|
||||
static struct g_class g_vinum_class = {
|
||||
.name = VINUM_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.taste = gv_taste,
|
||||
/*.destroy_geom = gv_destroy_geom,*/
|
||||
.ctlreq = gv_config,
|
||||
|
@ -512,6 +512,7 @@ gv_drive_destroy_geom(struct gctl_req *req, struct g_class *mp,
|
||||
|
||||
static struct g_class g_vinum_drive_class = {
|
||||
.name = VINUMDRIVE_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.taste = gv_drive_taste,
|
||||
.destroy_geom = gv_drive_destroy_geom
|
||||
};
|
||||
|
@ -479,6 +479,7 @@ gv_plex_destroy_geom(struct gctl_req *req, struct g_class *mp,
|
||||
|
||||
static struct g_class g_vinum_plex_class = {
|
||||
.name = VINUMPLEX_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.taste = gv_plex_taste,
|
||||
.destroy_geom = gv_plex_destroy_geom,
|
||||
};
|
||||
|
@ -253,6 +253,7 @@ gv_volume_destroy_geom(struct gctl_req *req, struct g_class *mp,
|
||||
|
||||
static struct g_class g_vinum_volume_class = {
|
||||
.name = VINUMVOLUME_CLASS_NAME,
|
||||
.version = G_VERSION,
|
||||
.taste = gv_volume_taste,
|
||||
.destroy_geom = gv_volume_destroy_geom,
|
||||
};
|
||||
|
@ -2355,8 +2355,12 @@ vmspace_swap_count(struct vmspace *vmspace)
|
||||
*
|
||||
*/
|
||||
|
||||
static g_orphan_t swapgeom_orphan;
|
||||
|
||||
static struct g_class g_swap_class = {
|
||||
.name = "SWAP",
|
||||
.version = G_VERSION,
|
||||
.orphan = swapgeom_orphan,
|
||||
};
|
||||
|
||||
DECLARE_GEOM_CLASS(g_swap_class, g_class);
|
||||
@ -2473,10 +2477,8 @@ swapongeom_ev(void *arg, int flags)
|
||||
}
|
||||
}
|
||||
mtx_unlock(&sw_dev_mtx);
|
||||
if (gp == NULL) {
|
||||
if (gp == NULL)
|
||||
gp = g_new_geomf(&g_swap_class, "swap", NULL);
|
||||
gp->orphan = swapgeom_orphan;
|
||||
}
|
||||
cp = g_new_consumer(gp);
|
||||
g_attach(cp, pp);
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user