From owner-p4-projects@FreeBSD.ORG  Fri Jul 14 03:11:17 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 126D416A4E7; Fri, 14 Jul 2006 03:11:17 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C5F4916A4DD
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 03:11:16 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 93D3243D49
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 03:11:16 +0000 (GMT)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6E3BG6X013411
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 03:11:16 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6E3BGUv013408
	for perforce@freebsd.org; Fri, 14 Jul 2006 03:11:16 GMT
	(envelope-from scottl@freebsd.org)
Date: Fri, 14 Jul 2006 03:11:16 GMT
Message-Id: <200607140311.k6E3BGUv013408@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101501 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Fri, 14 Jul 2006 03:11:17 -0000

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

Change 101501 by scottl@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));