PERFORCE change 44299 for review

[Sam Leffler]

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

Change 44299 by sam at 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;