From owner-svn-src-head@FreeBSD.ORG  Mon Jul 16 16:50:29 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 3E660106566B;
	Mon, 16 Jul 2012 16:50:29 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 299038FC21;
	Mon, 16 Jul 2012 16:50:29 +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 q6GGoTRi060574;
	Mon, 16 Jul 2012 16:50:29 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6GGoSCo060571;
	Mon, 16 Jul 2012 16:50:28 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201207161650.q6GGoSCo060571@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 16 Jul 2012 16:50:28 +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: r238533 - head/sys/geom
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jul 2012 16:50:29 -0000

Author: trasz
Date: Mon Jul 16 16:50:28 2012
New Revision: 238533
URL: http://svn.freebsd.org/changeset/base/238533

Log:
  Add back spare fields reused in r238213.  According to Attilio, the rule
  is to use reuse spares only when MFC-ing, not in CURRENT.

Modified:
  head/sys/geom/geom.h

Modified: head/sys/geom/geom.h
==============================================================================
--- head/sys/geom/geom.h	Mon Jul 16 11:58:44 2012	(r238532)
+++ head/sys/geom/geom.h	Mon Jul 16 16:50:28 2012	(r238533)
@@ -110,6 +110,7 @@ struct g_class {
 	g_ioctl_t		*ioctl;
 	g_provgone_t		*providergone;
 	g_resize_t		*resize;
+	void			*spare2;
 	/*
 	 * The remaining elements are private
 	 */
@@ -141,6 +142,7 @@ struct g_geom {
 	g_ioctl_t		*ioctl;
 	g_provgone_t		*providergone;
 	g_resize_t		*resize;
+	void			*spare1;
 	void			*softc;
 	unsigned		flags;
 #define	G_GEOM_WITHER		1