From owner-p4-projects@FreeBSD.ORG  Wed Oct 26 23:44:44 2005
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 EA25216A421; Wed, 26 Oct 2005 23:44:43 +0000 (GMT)
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 BDF1F16A41F
	for <perforce@freebsd.org>; Wed, 26 Oct 2005 23:44:43 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 80EF943D46
	for <perforce@freebsd.org>; Wed, 26 Oct 2005 23:44:43 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9QNihXN013999
	for <perforce@freebsd.org>; Wed, 26 Oct 2005 23:44:43 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9QNih8h013996
	for perforce@freebsd.org; Wed, 26 Oct 2005 23:44:43 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 26 Oct 2005 23:44:43 GMT
Message-Id: <200510262344.j9QNih8h013996@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>
Cc: 
Subject: PERFORCE change 85916 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: Wed, 26 Oct 2005 23:44:44 -0000

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

Change 85916 by rwatson@rwatson_zoo on 2005/10/26 23:43:58

	In zero-copy case, make sure to release mutex.  Bug introduced
	when new socket buffer assertions were added but did not consider
	the zero-copy case.
	
	Foot by:	kris

Affected files ...

.. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#12 edit

Differences ...

==== //depot/projects/netsmp/src/sys/kern/uipc_socket.c#12 (text+ko) ====

@@ -1246,6 +1246,7 @@
 				error = uiomoveco(mtod(m, char *) + moff,
 						  (int)len, uio,
 						  disposable);
+				SOCKBUF_LOCK(&so->so_rcv);
 			} else
 #endif /* ZERO_COPY_SOCKETS */
 			{