svn commit: r237545 - head/sys/geom

[Kenneth D. Merry]

Author: ken
Date: Mon Jun 25 04:26:10 2012
New Revision: 237545
URL: http://svn.freebsd.org/changeset/base/237545

Log:
  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

Modified:
  head/sys/geom/geom.h

Modified: head/sys/geom/geom.h
==============================================================================
--- head/sys/geom/geom.h	Mon Jun 25 03:06:29 2012	(r237544)
+++ head/sys/geom/geom.h	Mon Jun 25 04:26:10 2012	(r237545)
@@ -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;