From owner-p4-projects@FreeBSD.ORG  Fri Feb 27 16:59:56 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2AE0B16A4D0; Fri, 27 Feb 2004 16:59:56 -0800 (PST)
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 015FF16A4CE
	for <perforce@freebsd.org>; Fri, 27 Feb 2004 16:59:55 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C8EBE43D2F
	for <perforce@freebsd.org>; Fri, 27 Feb 2004 16:59:55 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i1S0xtGe026830
	for <perforce@freebsd.org>; Fri, 27 Feb 2004 16:59:55 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i1S0xt1X026827
	for perforce@freebsd.org; Fri, 27 Feb 2004 16:59:55 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 27 Feb 2004 16:59:55 -0800 (PST)
Message-Id: <200402280059.i1S0xt1X026827@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 47775 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sat, 28 Feb 2004 00:59:56 -0000

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

Change 47775 by rwatson@rwatson_tislabs on 2004/02/27 16:59:15

	Assert the socket lock directly in sofree() rather than relying
	on later unlock attempts to fail.

Affected files ...

.. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#3 edit

Differences ...

==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#3 (text+ko) ====

@@ -291,6 +291,7 @@
 	struct socket *so;
 {
 	KASSERT(so->so_count == 0, ("socket %p so_count not 0", so));
+	SOCK_LOCK_ASSERT(so);
 
 	if (so->so_pcb || (so->so_state & SS_NOFDREF) == 0) {
 		SOCK_UNLOCK(so);