From owner-p4-projects@FreeBSD.ORG  Fri Apr 13 16:49:04 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 04B2F16A407; Fri, 13 Apr 2007 16:49:04 +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 C9D7016A405
	for <perforce@freebsd.org>; Fri, 13 Apr 2007 16:49:03 +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 BA33013C469
	for <perforce@freebsd.org>; Fri, 13 Apr 2007 16:49:03 +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 l3DGn3oP093323
	for <perforce@freebsd.org>; Fri, 13 Apr 2007 16:49:03 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3DGn3Jg093320
	for perforce@freebsd.org; Fri, 13 Apr 2007 16:49:03 GMT
	(envelope-from scottl@freebsd.org)
Date: Fri, 13 Apr 2007 16:49:03 GMT
Message-Id: <200704131649.l3DGn3Jg093320@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 118014 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 16:49:04 -0000

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

Change 118014 by scottl@scottl-y1 on 2007/04/13 16:48:19

	Change the last instances of tsleep to msleep.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_targ_bh.c#7 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_target.c#11 edit

Differences ...

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

@@ -447,7 +447,7 @@
 		/* FALLTHROUGH */
 	default:
 		/* XXX Wait for callback of targbhdislun() */
-		tsleep(softc, PRIBIO, "targbh", hz/2);
+		msleep(softc, periph->sim->mtx, PRIBIO, "targbh", hz/2);
 		free(softc, M_SCSIBH);
 		break;
 	}

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

@@ -1083,7 +1083,7 @@
 
 	/* If we aborted at least one pending CCB ok, wait for it. */
 	if (cab.ccb_h.status == CAM_REQ_CMP) {
-		tsleep(&softc->pending_ccb_queue,
+		msleep(&softc->pending_ccb_queue, softc->path->sim->mtx,
 		       PRIBIO | PCATCH, "tgabrt", 0);
 	}