PERFORCE change 101501 for review

[Scott Long]

http://perforce.freebsd.org/chv.cgi?CH=101501

Change 101501 by scottl at scottl-x64 on 2006/07/14 03:10:59

	Re-allow anonymous CCB's.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#41 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#9 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#41 (text+ko) ====

@@ -4981,9 +4981,11 @@
 	union ccb *new_ccb;
 
 	new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_WAITOK);
-	callout_handle_init(&new_ccb->ccb_h.timeout_ch);
-	callout_init(&new_ccb->ccb_h.callout,
-	    (sim->flags & CAM_SIM_MPSAFE) ? 1 : 0);
+	if (sim != NULL) {
+		callout_handle_init(&new_ccb->ccb_h.timeout_ch);
+		callout_init(&new_ccb->ccb_h.callout,
+		    (sim->flags & CAM_SIM_MPSAFE) ? 1 : 0);
+	}
 	return (new_ccb);
 }
 

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#9 (text+ko) ====

@@ -966,7 +966,7 @@
 	struct scsi_low_softc *slp;
 {
   	struct cam_path *path;
-	union ccb *ccb = xpt_alloc_ccb(path->sim);
+	union ccb *ccb = xpt_alloc_ccb(NULL);
 	cam_status status;
 
 	bzero(ccb, sizeof(union ccb));