From owner-p4-projects@FreeBSD.ORG  Fri Sep 22 17:09:12 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 B43F916A416; Fri, 22 Sep 2006 17:09:12 +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 8FE5F16A407
	for <perforce@freebsd.org>; Fri, 22 Sep 2006 17:09:12 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 588E443D5A
	for <perforce@freebsd.org>; Fri, 22 Sep 2006 17:09:12 +0000 (GMT)
	(envelope-from mjacob@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 k8MH9CYD038930
	for <perforce@freebsd.org>; Fri, 22 Sep 2006 17:09:12 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8MH9C4O038926
	for perforce@freebsd.org; Fri, 22 Sep 2006 17:09:12 GMT
	(envelope-from mjacob@freebsd.org)
Date: Fri, 22 Sep 2006 17:09:12 GMT
Message-Id: <200609221709.k8MH9C4O038926@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 106510 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, 22 Sep 2006 17:09:12 -0000

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

Change 106510 by mjacob@newisp on 2006/09/22 17:08:44

	Add (bogus for now) 2CAM/FROMCAM locks.

Affected files ...

.. //depot/projects/newisp/dev/mpt/mpt_raid.c#2 edit

Differences ...

==== //depot/projects/newisp/dev/mpt/mpt_raid.c#2 (text+ko) ====

@@ -1595,16 +1595,19 @@
 
 		mpt->raid_rescan = 0;
 
+		MPTLOCK_2_CAMLOCK(mpt);
 		error = xpt_create_path(&path, xpt_periph,
 					cam_sim_path(mpt->sim),
 					mpt_vol->config_page->VolumeID,
 					/*lun*/0);
 		if (error != CAM_REQ_CMP) {
+			CAMLOCK_2_MPTLOCK(mpt);
 			mpt_vol_prt(mpt, mpt_vol, "Unable to allocate path!\n");
 			continue;
 		}
 		mpt_adjust_queue_depth(mpt, mpt_vol, path);
 		xpt_free_path(path);
+		CAMLOCK_2_MPTLOCK(mpt);
 	}
 	MPT_UNLOCK(mpt);
 	return (0);