From owner-p4-projects@FreeBSD.ORG  Tue Dec  9 10:19:37 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 036C016A4D1; Tue,  9 Dec 2003 10:19:37 -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 D36C616A4CF
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 10:19:36 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 09EAF43D1D
	for <perforce@freebsd.org>; Tue,  9 Dec 2003 10:19:36 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hB9IJZXJ013382
	for <perforce@freebsd.org>; Tue, 9 Dec 2003 10:19:35 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hB9IJZmq013379
	for perforce@freebsd.org; Tue, 9 Dec 2003 10:19:35 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Tue, 9 Dec 2003 10:19:35 -0800 (PST)
Message-Id: <200312091819.hB9IJZmq013379@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 43682 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: Tue, 09 Dec 2003 18:19:37 -0000

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

Change 43682 by sam@sam_ebb on 2003/12/09 10:18:42

	IFC

Affected files ...

.. //depot/projects/netperf+sockets/sys/kern/uipc_syscalls.c#3 integrate

Differences ...

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

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.157 2003/10/19 20:41:07 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.159 2003/12/01 22:12:50 dg Exp $");
 
 #include "opt_compat.h"
 #include "opt_ktrace.h"
@@ -60,6 +60,7 @@
 #include <sys/mount.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
+#include <sys/sf_buf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/signalvar.h>
@@ -1868,7 +1869,7 @@
 		MGETHDR(m, M_TRYWAIT, MT_DATA);
 		if (m == NULL) {
 			error = ENOBUFS;
-			sf_buf_free((void *)sf->kva, sf);
+			sf_buf_free((void *)sf_buf_kva(sf), sf);
 			SOCKBUF_LOCK(&so->so_snd);
 			sbunlock(&so->so_snd);
 			SOCKBUF_UNLOCK(&so->so_snd);
@@ -1877,9 +1878,9 @@
 		/*
 		 * Setup external storage for mbuf.
 		 */
-		MEXTADD(m, sf->kva, PAGE_SIZE, sf_buf_free, sf, M_RDONLY,
+		MEXTADD(m, sf_buf_kva(sf), PAGE_SIZE, sf_buf_free, sf, M_RDONLY,
 		    EXT_SFBUF);
-		m->m_data = (char *) sf->kva + pgoff;
+		m->m_data = (char *)sf_buf_kva(sf) + pgoff;
 		m->m_pkthdr.len = m->m_len = xfsize;
 		/*
 		 * Add the buffer to the socket buffer chain.
@@ -1987,5 +1988,7 @@
 		vrele(vp);
 	if (so)
 		fputsock(so);
+	if (error == ERESTART)
+		error = EINTR;
 	return (error);
 }