From owner-svn-src-all@FreeBSD.ORG  Mon Jun 25 04:26:11 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5431A106566B;
	Mon, 25 Jun 2012 04:26:11 +0000 (UTC) (envelope-from ken@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3F5678FC19;
	Mon, 25 Jun 2012 04:26:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5P4QBTA049885;
	Mon, 25 Jun 2012 04:26:11 GMT (envelope-from ken@svn.freebsd.org)
Received: (from ken@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5P4QBSA049883;
	Mon, 25 Jun 2012 04:26:11 GMT (envelope-from ken@svn.freebsd.org)
Message-Id: <201206250426.q5P4QBSA049883@svn.freebsd.org>
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Mon, 25 Jun 2012 04:26:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237545 - head/sys/geom
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Jun 2012 04:26:11 -0000

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;