From owner-p4-projects@FreeBSD.ORG  Tue Mar 27 22:42:28 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 AC37916A404; Tue, 27 Mar 2007 22:42:28 +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 5BACD16A402
	for <perforce@freebsd.org>; Tue, 27 Mar 2007 22:42:28 +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 4C4E913C45D
	for <perforce@freebsd.org>; Tue, 27 Mar 2007 22:42:28 +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 l2RMgSFK043065
	for <perforce@freebsd.org>; Tue, 27 Mar 2007 22:42:28 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2RMgRkM043005
	for perforce@freebsd.org; Tue, 27 Mar 2007 22:42:27 GMT
	(envelope-from scottl@freebsd.org)
Date: Tue, 27 Mar 2007 22:42:27 GMT
Message-Id: <200703272242.l2RMgRkM043005@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 116708 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: Tue, 27 Mar 2007 22:42:29 -0000

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

Change 116708 by scottl@scottl-x64 on 2007/03/27 22:41:28

	Fix a couple of accidents.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_periph.c#17 edit
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#27 edit

Differences ...

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

@@ -849,9 +849,9 @@
 	struct cam_sim *sim;
 	int error;
  
-	mtx_assert(sim->mtx, MA_OWNED);
 	error = 0;
 	sim = xpt_path_sim(ccb->ccb_h.path);
+	mtx_assert(sim->mtx, MA_OWNED);
 
 	/*
 	 * If the user has supplied a stats structure, and if we understand

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

@@ -743,7 +743,7 @@
 	 * Schedule ourselves for performing the work.
 	 */
 	xpt_schedule(periph, /* XXX priority */1);
-	cam_periph_lock(periph);
+	cam_periph_unlock(periph);
 
 	return;
 }