From owner-p4-projects@FreeBSD.ORG  Mon Apr 30 20:47:16 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 D722816A404; Mon, 30 Apr 2007 20:47:15 +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 A0A3B16A400
	for <perforce@FreeBSD.org>; Mon, 30 Apr 2007 20:47:15 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 9183113C465
	for <perforce@FreeBSD.org>; Mon, 30 Apr 2007 20:47:15 +0000 (UTC)
	(envelope-from hselasky@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 l3UKlFXb004723
	for <perforce@FreeBSD.org>; Mon, 30 Apr 2007 20:47:15 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3UKlFYR004720
	for perforce@freebsd.org; Mon, 30 Apr 2007 20:47:15 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 30 Apr 2007 20:47:15 GMT
Message-Id: <200704302047.l3UKlFYR004720@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 119023 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: Mon, 30 Apr 2007 20:47:16 -0000

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

Change 119023 by hselasky@hselasky_mini_itx on 2007/04/30 20:46:29

	Try to fix some issues with Scott's new Giant-free CAM layer.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/umass.c#14 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/umass.c#14 (text+ko) ====

@@ -1274,15 +1274,13 @@
 	sc->sc_last_xfer_index = UMASS_T_MAX;
 
 	for (i = 0; i < UMASS_T_MAX; i++) {
-	    if (sc->sc_xfer[i]) {
-	        usbd_transfer_stop(sc->sc_xfer[i]);
-	    }
+		usbd_transfer_stop(sc->sc_xfer[i]);
 	}
 
+	umass_cam_detach_sim(sc);
+
 	mtx_unlock(&(sc->sc_mtx));
 
-	umass_cam_detach_sim(sc);
-
 	usbd_transfer_unsetup(sc->sc_xfer, UMASS_T_MAX);
 
 	mtx_destroy(&(sc->sc_mtx));
@@ -2286,10 +2284,15 @@
 	    return ENOMEM;
 	}
 
+	mtx_lock(&(sc->sc_mtx));
+
 	if(xpt_bus_register(sc->sc_sim, sc->sc_unit) != CAM_SUCCESS) {
+	    mtx_unlock(&(sc->sc_mtx));
 	    return ENOMEM;
 	}
 
+	mtx_unlock(&(sc->sc_mtx));
+
 	return(0);
 }
 
@@ -2331,9 +2334,12 @@
 	   return;
 	}
 
+	mtx_lock(&(sc->sc_mtx));
+
 	if (xpt_create_path(&path, xpt_periph, cam_sim_path(sc->sc_sim),
 			    CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) 
 	    != CAM_REQ_CMP) {
+	    mtx_unlock(&(sc->sc_mtx));
 	    free(ccb, M_USBDEV);
 	    return;
 	}
@@ -2344,6 +2350,8 @@
 	ccb->crcn.flags = CAM_FLAG_NONE;
 	xpt_action(ccb);
 
+	mtx_unlock(&(sc->sc_mtx));
+
 	/* The scan is in progress now. */
 
 	return;