From owner-p4-projects@FreeBSD.ORG  Tue Nov  3 19:26:14 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1F7751065679; Tue,  3 Nov 2009 19:26:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D76FE1065670
	for <perforce@freebsd.org>; Tue,  3 Nov 2009 19:26:13 +0000 (UTC)
	(envelope-from mav@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C47AA8FC16
	for <perforce@freebsd.org>; Tue,  3 Nov 2009 19:26:13 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nA3JQDEL085010
	for <perforce@freebsd.org>; Tue, 3 Nov 2009 19:26:13 GMT
	(envelope-from mav@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nA3JQD4m085008
	for perforce@freebsd.org; Tue, 3 Nov 2009 19:26:13 GMT
	(envelope-from mav@freebsd.org)
Date: Tue, 3 Nov 2009 19:26:13 GMT
Message-Id: <200911031926.nA3JQD4m085008@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mav@freebsd.org using -f
From: Alexander Motin <mav@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 170125 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Nov 2009 19:26:14 -0000

http://p4web.freebsd.org/chv.cgi?CH=170125

Change 170125 by mav@mav_mavbook on 2009/11/03 19:25:52

	Undo struct cam_sim elements reorder.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#13 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_sim.h#13 (text+ko) ====

@@ -94,13 +94,23 @@
 	const char		*sim_name;
 	void			*softc;
 	struct mtx		*mtx;
-	struct cam_devq 	*devq;	/* Device Queue to use for this SIM */
+	TAILQ_HEAD(, ccb_hdr)	sim_doneq;
 	TAILQ_ENTRY(cam_sim)	links;
 	u_int32_t		path_id;/* The Boot device may set this to 0? */
 	u_int32_t		unit_number;
 	u_int32_t		bus_id;
 	int			max_tagged_dev_openings;
 	int			max_dev_openings;
+	u_int32_t		flags;
+#define	CAM_SIM_REL_TIMEOUT_PENDING	0x01
+#define	CAM_SIM_MPSAFE			0x02
+#define CAM_SIM_ON_DONEQ		0x04
+	struct callout		callout;
+	struct cam_devq 	*devq;	/* Device Queue to use for this SIM */
+	int			refcount; /* References to the SIM. */
+
+	/* "Pool" of inactive ccbs managed by xpt_get_ccb and xpt_release_ccb */
+	SLIST_HEAD(,ccb_hdr)	ccb_freeq;
 	/*
 	 * Maximum size of ccb pool.  Modified as devices are added/removed
 	 * or have their * opening counts changed.
@@ -108,15 +118,7 @@
 	u_int			max_ccbs;
 	/* Current count of allocated ccbs */
 	u_int			ccb_count;
-	struct callout		callout;
-	u_int32_t		flags;
-#define	CAM_SIM_REL_TIMEOUT_PENDING	0x01
-#define	CAM_SIM_MPSAFE			0x02
-#define CAM_SIM_ON_DONEQ		0x04
-	int			refcount; /* References to the SIM. */
-	TAILQ_HEAD(, ccb_hdr)	sim_doneq; /* Completed requests queue. */
-	/* "Pool" of inactive ccbs managed by xpt_get_ccb and xpt_release_ccb */
-	SLIST_HEAD(, ccb_hdr)	ccb_freeq;
+
 };
 
 #define CAM_SIM_LOCK(sim)	mtx_lock((sim)->mtx);