svn commit: r238559 - head/sys/geom

[Kenneth D. Merry]

Author: ken
Date: Tue Jul 17 22:16:10 2012
New Revision: 238559
URL: http://svn.freebsd.org/changeset/base/238559

Log:
  Add back spare fields consumed in r237545.  It seems that these should only
  be consumed to maintain backward compatibility in stable, but should not be
  consumed in head.
  
  Submitted by:	trasz, attilio (indirectly)

Modified:
  head/sys/geom/geom.h

Modified: head/sys/geom/geom.h
==============================================================================
--- head/sys/geom/geom.h	Tue Jul 17 19:57:34 2012	(r238558)
+++ head/sys/geom/geom.h	Tue Jul 17 22:16:10 2012	(r238559)
@@ -110,6 +110,7 @@ struct g_class {
 	g_ioctl_t		*ioctl;
 	g_provgone_t		*providergone;
 	g_resize_t		*resize;
+	void			*spare1;
 	void			*spare2;
 	/*
 	 * The remaining elements are private
@@ -142,6 +143,7 @@ struct g_geom {
 	g_ioctl_t		*ioctl;
 	g_provgone_t		*providergone;
 	g_resize_t		*resize;
+	void			*spare0;
 	void			*spare1;
 	void			*softc;
 	unsigned		flags;