From 365e076ed2c1689861d3dcc1e797cc8710101f8b Mon Sep 17 00:00:00 2001 From: "Kenneth D. Merry" Date: Mon, 25 Jun 2012 04:26:10 +0000 Subject: [PATCH] Consume spare fields for the providergone pointers added to the g_class and g_geom structures in change 237518. The original change would have broken the ABI. Suggested by: ae MFC after: 4 days --- sys/geom/geom.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/geom/geom.h b/sys/geom/geom.h index 08532e2ecdaa..e85448c1b942 100644 --- a/sys/geom/geom.h +++ b/sys/geom/geom.h @@ -103,12 +103,11 @@ struct g_class { g_start_t *start; g_spoiled_t *spoiled; g_attrchanged_t *attrchanged; - g_provgone_t *providergone; g_dumpconf_t *dumpconf; g_access_t *access; g_orphan_t *orphan; g_ioctl_t *ioctl; - void *spare1; + g_provgone_t *providergone; void *spare2; /* * The remaining elements are private @@ -135,12 +134,11 @@ struct g_geom { g_start_t *start; g_spoiled_t *spoiled; g_attrchanged_t *attrchanged; - g_provgone_t *providergone; g_dumpconf_t *dumpconf; g_access_t *access; g_orphan_t *orphan; g_ioctl_t *ioctl; - void *spare0; + g_provgone_t *providergone; void *spare1; void *softc; unsigned flags;