From owner-p4-projects@FreeBSD.ORG  Wed Dec 24 17:52:34 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D438716A4D0; Wed, 24 Dec 2003 17:52:33 -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 AF73316A4CE
	for <perforce@freebsd.org>; Wed, 24 Dec 2003 17:52:33 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EC2D343D39
	for <perforce@freebsd.org>; Wed, 24 Dec 2003 17:52:32 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id hBP1qW0B026200
	for <perforce@freebsd.org>; Wed, 24 Dec 2003 17:52:32 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id hBP1qWkI026197
	for perforce@freebsd.org; Wed, 24 Dec 2003 17:52:32 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Wed, 24 Dec 2003 17:52:32 -0800 (PST)
Message-Id: <200312250152.hBP1qWkI026197@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 44299 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: Thu, 25 Dec 2003 01:52:34 -0000

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

Change 44299 by sam@sam_ebb on 2003/12/24 17:52:19

	revert use of M_WAITOK when dup'ing a sockaddr; this causes
	grief for nfs; need to think about this some more

Affected files ...

.. //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#10 edit

Differences ...

==== //depot/projects/netperf+sockets/sys/kern/uipc_socket.c#10 (text+ko) ====

@@ -903,10 +903,12 @@
 		KASSERT(m->m_type == MT_SONAME,
 		    ("m->m_type == %d", m->m_type));
 		if (psa) {
-			SOCKBUF_UNLOCK(&so->so_rcv);
 			*psa = sodupsockaddr(mtod(m, struct sockaddr *),
-					M_WAITOK);
-			SOCKBUF_LOCK(&so->so_rcv);
+					M_NOWAIT);
+			if (*psa == NULL) {
+				error = ENOMEM;
+				goto release;
+			}
 		}
 		if (flags & MSG_PEEK) {
 			m = m->m_next;