PERFORCE change 170125 for review

[Alexander Motin]

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

Change 170125 by mav at 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);