From owner-p4-projects@FreeBSD.ORG  Tue May  1 08:50:13 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 1BA9D16A409; Tue,  1 May 2007 08:50:13 +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 CDC7C16A407
	for <perforce@FreeBSD.org>; Tue,  1 May 2007 08:50:12 +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 A86EF13C458
	for <perforce@FreeBSD.org>; Tue,  1 May 2007 08:50:12 +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 l418oCid010673
	for <perforce@FreeBSD.org>; Tue, 1 May 2007 08:50:12 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l418oC1o010670
	for perforce@freebsd.org; Tue, 1 May 2007 08:50:12 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 1 May 2007 08:50:12 GMT
Message-Id: <200705010850.l418oC1o010670@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 119056 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, 01 May 2007 08:50:13 -0000

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

Change 119056 by hselasky@hselasky_mini_itx on 2007/05/01 08:50:02

	Fix some locking issues in "umass.c".
	Make locking changes in change 119023 conditional.

Affected files ...

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

Differences ...

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

@@ -1277,9 +1277,14 @@
 		usbd_transfer_stop(sc->sc_xfer[i]);
 	}
 
+#if (__FreeBSD_version < 700037)
+	mtx_unlock(&(sc->sc_mtx));
+#endif
 	umass_cam_detach_sim(sc);
 
+#if (__FreeBSD_version >= 700037)
 	mtx_unlock(&(sc->sc_mtx));
+#endif
 
 	usbd_transfer_unsetup(sc->sc_xfer, UMASS_T_MAX);
 
@@ -2284,15 +2289,20 @@
 	    return ENOMEM;
 	}
 
+#if (__FreeBSD_version >= 700037)
 	mtx_lock(&(sc->sc_mtx));
+#endif
 
 	if(xpt_bus_register(sc->sc_sim, sc->sc_unit) != CAM_SUCCESS) {
+#if (__FreeBSD_version >= 700037)
 	    mtx_unlock(&(sc->sc_mtx));
+#endif
 	    return ENOMEM;
 	}
 
+#if (__FreeBSD_version >= 700037)
 	mtx_unlock(&(sc->sc_mtx));
-
+#endif
 	return(0);
 }
 
@@ -2334,12 +2344,16 @@
 	   return;
 	}
 
+#if (__FreeBSD_version >= 700037)
 	mtx_lock(&(sc->sc_mtx));
+#endif
 
 	if (xpt_create_path(&path, xpt_periph, cam_sim_path(sc->sc_sim),
 			    CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) 
 	    != CAM_REQ_CMP) {
+#if (__FreeBSD_version >= 700037)
 	    mtx_unlock(&(sc->sc_mtx));
+#endif
 	    free(ccb, M_USBDEV);
 	    return;
 	}
@@ -2350,7 +2364,9 @@
 	ccb->crcn.flags = CAM_FLAG_NONE;
 	xpt_action(ccb);
 
+#if (__FreeBSD_version >= 700037)
 	mtx_unlock(&(sc->sc_mtx));
+#endif
 
 	/* The scan is in progress now. */
 
@@ -2411,7 +2427,9 @@
 	struct umass_softc *sc = (struct umass_softc *)sim->softc;
 
 	if (sc) {
+#if (__FreeBSD_version < 700037)
 	    mtx_lock(&(sc->sc_mtx));
+#endif
 
 	    /* The softc is still there, but marked as going away. umass_cam_detach
 	     * has not yet notified CAM of the lost device however.
@@ -2699,9 +2717,11 @@
 	}
 
  done:
+#if (__FreeBSD_version < 700037)
 	if (sc) {
 	    mtx_unlock(&(sc->sc_mtx));
 	}
+#endif
 	return;
 }