From owner-p4-projects@FreeBSD.ORG  Fri Apr 13 17:15:45 2007
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 29EEE16A406; Fri, 13 Apr 2007 17:15:45 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B376A16A404
	for <perforce@freebsd.org>; Fri, 13 Apr 2007 17:15:44 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id A335113C4AD
	for <perforce@freebsd.org>; Fri, 13 Apr 2007 17:15:44 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3DHFiGc099445
	for <perforce@freebsd.org>; Fri, 13 Apr 2007 17:15:44 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DHFi38099408
	for perforce@freebsd.org; Fri, 13 Apr 2007 17:15:44 GMT
	(envelope-from scottl@freebsd.org)
Date: Fri, 13 Apr 2007 17:15:44 GMT
Message-Id: <200704131715.l3DHFi38099408@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 118018 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, 13 Apr 2007 17:15:45 -0000

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

Change 118018 by scottl@scottl-y1 on 2007/04/13 17:11:24

	Fix compile errors from the last version.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#12 edit

Differences ...

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

@@ -1051,6 +1051,7 @@
 	struct targ_cmd_descr   *descr;
 	struct ccb_abort	 cab;
 	struct ccb_hdr		*ccb_h;
+	struct cam_sim		*sim;
 
 	CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("abort_all_pending\n"));
 
@@ -1083,7 +1084,8 @@
 
 	/* If we aborted at least one pending CCB ok, wait for it. */
 	if (cab.ccb_h.status == CAM_REQ_CMP) {
-		msleep(&softc->pending_ccb_queue, softc->path->sim->mtx,
+		sim = xpt_path_sim(softc->path);
+		msleep(&softc->pending_ccb_queue, sim->mtx,
 		       PRIBIO | PCATCH, "tgabrt", 0);
 	}