PERFORCE change 47890 for review
Robert Watson
rwatson at FreeBSD.org
Sun Feb 29 20:39:45 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=47890
Change 47890 by rwatson at rwatson_tislabs on 2004/02/29 20:38:43
Integrate netperf_socket branch to loop back recent merge
of sodupsockaddr(), flag fix for soalloc().
Affected files ...
.. //depot/projects/netperf_socket/sys/conf/NOTES#4 integrate
.. //depot/projects/netperf_socket/sys/conf/files#4 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ubser.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/usb/ubser.h#1 branch
.. //depot/projects/netperf_socket/sys/fs/portalfs/portal_vnops.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#6 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#4 integrate
.. //depot/projects/netperf_socket/sys/modules/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/ubser/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/net/raw_usrreq.c#3 integrate
.. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate
.. //depot/projects/netperf_socket/sys/netipx/ipx_pcb.c#3 integrate
.. //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#3 integrate
.. //depot/projects/netperf_socket/sys/netnatm/natm.c#3 integrate
.. //depot/projects/netperf_socket/sys/netsmb/smb_conn.c#4 integrate
.. //depot/projects/netperf_socket/sys/netsmb/smb_trantcp.c#3 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#4 integrate
.. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvcache.c#3 integrate
.. //depot/projects/netperf_socket/sys/sys/socketvar.h#4 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#3 integrate
Differences ...
==== //depot/projects/netperf_socket/sys/conf/NOTES#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1201 2004/02/28 20:56:34 phk Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1202 2004/03/01 02:34:48 ticso Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -2167,6 +2167,8 @@
device uvscom
# USB Visor and Palm devices
device uvisor
+# USB support for BWCT console serial adapters
+device ubser
# USB Fm Radio
device ufm
==== //depot/projects/netperf_socket/sys/conf/files#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.869 2004/02/28 23:04:45 marcel Exp $
+# $FreeBSD: src/sys/conf/files,v 1.870 2004/03/01 02:34:48 ticso Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -822,6 +822,7 @@
dev/usb/ohci.c optional ohci
dev/usb/ohci_pci.c optional ohci pci
dev/usb/ubsa.c optional ubsa ucom
+dev/usb/ubser.c optional ubser
dev/usb/ucom.c optional ucom
dev/usb/udbp.c optional udbp
dev/usb/ufm.c optional ufm
==== //depot/projects/netperf_socket/sys/fs/portalfs/portal_vnops.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
*
* @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95
*
- * $FreeBSD: src/sys/fs/portalfs/portal_vnops.c,v 1.59 2003/03/03 19:15:38 njl Exp $
+ * $FreeBSD: src/sys/fs/portalfs/portal_vnops.c,v 1.60 2004/03/01 03:14:21 rwatson Exp $
*/
/*
@@ -199,7 +199,8 @@
unp3 = sotounpcb(so3);
if (unp2->unp_addr)
unp3->unp_addr = (struct sockaddr_un *)
- dup_sockaddr((struct sockaddr *)unp2->unp_addr, 0);
+ sodupsockaddr((struct sockaddr *)unp2->unp_addr,
+ M_NOWAIT);
so2 = so3;
return (unp_connect2(so, so2));
==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#6 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.163 2004/02/29 17:54:05 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.165 2004/03/01 03:14:21 rwatson Exp $");
#include "opt_inet.h"
#include "opt_mac.h"
@@ -138,7 +138,7 @@
so = uma_zalloc(socket_zone, mflags | M_ZERO);
if (so) {
#ifdef MAC
- error = mac_init_socket(so, flag);
+ error = mac_init_socket(so, mflags);
if (error != 0) {
uma_zfree(socket_zone, so);
so = NULL;
==== //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#5 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.120 2004/02/29 17:54:05 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_socket2.c,v 1.121 2004/03/01 03:14:21 rwatson Exp $");
#include "opt_mac.h"
#include "opt_param.h"
@@ -1308,7 +1308,7 @@
{
struct sockaddr *sa2;
- MALLOC(sa2, struct sockaddr *, sa->sa_len, M_SONAME, mflags);
+ sa2 = malloc(sa->sa_len, M_SONAME, mflags);
if (sa2)
bcopy(sa, sa2, sa->sa_len);
return sa2;
==== //depot/projects/netperf_socket/sys/kern/uipc_usrreq.c#4 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.116 2004/02/22 01:11:53 cperciva Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.117 2004/03/01 03:14:21 rwatson Exp $");
#include "opt_mac.h"
==== //depot/projects/netperf_socket/sys/modules/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.368 2004/02/28 00:12:46 sanpei Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.369 2004/03/01 02:34:49 ticso Exp $
# pcic -- currently broken and being worked on out of tree.
# oldcard -- specialized use for debugging only.
@@ -205,6 +205,7 @@
uart \
ubsa \
ubsec \
+ ubser \
ucom \
udav \
udbp \
==== //depot/projects/netperf_socket/sys/net/raw_usrreq.c#3 (text+ko) ====
@@ -31,11 +31,12 @@
* SUCH DAMAGE.
*
* @(#)raw_usrreq.c 8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.30 2003/11/18 00:39:03 rwatson Exp $
+ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.31 2004/03/01 03:14:21 rwatson Exp $
*/
#include <sys/param.h>
#include <sys/lock.h>
+#include <sys/malloc.h>
#include <sys/mbuf.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
==== //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#3 (text+ko) ====
@@ -2,7 +2,7 @@
* Copyright (c) 1990,1994 Regents of The University of Michigan.
* All Rights Reserved. See COPYRIGHT.
*
- * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.33 2003/11/18 00:39:03 rwatson Exp $
+ * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.34 2004/03/01 03:14:22 rwatson Exp $
*/
#include <sys/param.h>
==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*
* $Id: ng_btsocket_hci_raw.c,v 1.14 2003/09/14 23:29:06 max Exp $
- * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c,v 1.11 2004/01/26 15:19:43 harti Exp $
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c,v 1.12 2004/03/01 03:14:22 rwatson Exp $
*/
#include <sys/param.h>
@@ -1560,7 +1560,7 @@
sa.hci_family = AF_BLUETOOTH;
strlcpy(sa.hci_node, pcb->addr.hci_node, sizeof(sa.hci_node));
- *nam = dup_sockaddr((struct sockaddr *) &sa, 0);
+ *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT);
return ((*nam == NULL)? ENOMEM : 0);
} /* ng_btsocket_hci_raw_sockaddr */
==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*
* $Id: ng_btsocket_l2cap.c,v 1.16 2003/09/14 23:29:06 max Exp $
- * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.9 2003/12/24 18:51:01 alfred Exp $
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c,v 1.10 2004/03/01 03:14:22 rwatson Exp $
*/
#include <sys/param.h>
@@ -2435,7 +2435,7 @@
sa.l2cap_len = sizeof(sa);
sa.l2cap_family = AF_BLUETOOTH;
- *nam = dup_sockaddr((struct sockaddr *) &sa, 0);
+ *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT);
return ((*nam == NULL)? ENOMEM : 0);
} /* ng_btsocket_l2cap_peeraddr */
@@ -2588,7 +2588,7 @@
sa.l2cap_len = sizeof(sa);
sa.l2cap_family = AF_BLUETOOTH;
- *nam = dup_sockaddr((struct sockaddr *) &sa, 0);
+ *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT);
return ((*nam == NULL)? ENOMEM : 0);
} /* ng_btsocket_l2cap_sockaddr */
==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*
* $Id: ng_btsocket_l2cap_raw.c,v 1.12 2003/09/14 23:29:06 max Exp $
- * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c,v 1.8 2003/12/24 18:51:01 alfred Exp $
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c,v 1.9 2004/03/01 03:14:22 rwatson Exp $
*/
#include <sys/param.h>
@@ -1180,7 +1180,7 @@
sa.l2cap_len = sizeof(sa);
sa.l2cap_family = AF_BLUETOOTH;
- *nam = dup_sockaddr((struct sockaddr *) &sa, 0);
+ *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT);
return ((*nam == NULL)? ENOMEM : 0);
} /* ng_btsocket_l2cap_raw_peeraddr */
@@ -1219,7 +1219,7 @@
sa.l2cap_len = sizeof(sa);
sa.l2cap_family = AF_BLUETOOTH;
- *nam = dup_sockaddr((struct sockaddr *) &sa, 0);
+ *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT);
return ((*nam == NULL)? ENOMEM : 0);
} /* ng_btsocket_l2cap_raw_sockaddr */
==== //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*
* $Id: ng_btsocket_rfcomm.c,v 1.28 2003/09/14 23:29:06 max Exp $
- * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.3 2003/10/12 22:04:21 emax Exp $
+ * $FreeBSD: src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c,v 1.4 2004/03/01 03:14:22 rwatson Exp $
*/
#include <sys/param.h>
@@ -879,7 +879,7 @@
sa.rfcomm_len = sizeof(sa);
sa.rfcomm_family = AF_BLUETOOTH;
- *nam = dup_sockaddr((struct sockaddr *) &sa, 0);
+ *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT);
return ((*nam == NULL)? ENOMEM : 0);
} /* ng_btsocket_rfcomm_peeraddr */
@@ -945,7 +945,7 @@
sa.rfcomm_len = sizeof(sa);
sa.rfcomm_family = AF_BLUETOOTH;
- *nam = dup_sockaddr((struct sockaddr *) &sa, 0);
+ *nam = sodupsockaddr((struct sockaddr *) &sa, M_NOWAIT);
return ((*nam == NULL)? ENOMEM : 0);
} /* ng_btsocket_rfcomm_sockaddr */
==== //depot/projects/netperf_socket/sys/netipx/ipx_pcb.c#3 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.26 2003/06/11 05:25:14 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.27 2004/03/01 03:14:22 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/netperf_socket/sys/netipx/spx_usrreq.c#3 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.40 2003/11/18 00:39:05 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.41 2004/03/01 03:14:22 rwatson Exp $");
#include <sys/param.h>
#include <sys/lock.h>
==== //depot/projects/netperf_socket/sys/netnatm/natm.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netnatm/natm.c,v 1.31 2003/11/18 00:39:05 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netnatm/natm.c,v 1.32 2004/03/01 03:14:22 rwatson Exp $");
#include <sys/param.h>
#include <sys/conf.h>
==== //depot/projects/netperf_socket/sys/netsmb/smb_conn.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netsmb/smb_conn.c,v 1.11 2004/02/26 00:27:03 truckman Exp $");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_conn.c,v 1.12 2004/03/01 03:14:22 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/netperf_socket/sys/netsmb/smb_trantcp.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netsmb/smb_trantcp.c,v 1.18 2003/06/11 05:32:09 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/netsmb/smb_trantcp.c,v 1.19 2004/03/01 03:14:22 rwatson Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
==== //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#4 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.147 2004/02/22 01:17:47 cperciva Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.148 2004/03/01 03:14:23 rwatson Exp $");
#include "opt_bootp.h"
#include "opt_nfsroot.h"
==== //depot/projects/netperf_socket/sys/nfsserver/nfs_srvcache.c#3 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvcache.c,v 1.35 2003/03/02 16:54:38 des Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_srvcache.c,v 1.36 2004/03/01 03:14:23 rwatson Exp $");
/*
* Reference: Chet Juszczak, "Improving the Performance and Correctness
@@ -50,7 +50,7 @@
#include <sys/systm.h>
#include <sys/mbuf.h>
#include <sys/socket.h>
-#include <sys/socketvar.h> /* for dup_sockaddr */
+#include <sys/socketvar.h> /* for sodupsockaddr */
#include <netinet/in.h>
#include <nfs/rpcv2.h>
==== //depot/projects/netperf_socket/sys/sys/socketvar.h#4 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)socketvar.h 8.3 (Berkeley) 2/19/95
- * $FreeBSD: src/sys/sys/socketvar.h,v 1.109 2004/02/29 17:54:05 rwatson Exp $
+ * $FreeBSD: src/sys/sys/socketvar.h,v 1.110 2004/03/01 03:14:23 rwatson Exp $
*/
#ifndef _SYS_SOCKETVAR_H_
==== //depot/projects/netperf_socket/sys/vm/vm_mmap.c#3 (text+ko) ====
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.180 2004/02/27 22:02:15 kan Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_mmap.c,v 1.181 2004/03/01 02:44:33 kan Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -284,16 +284,14 @@
lim_max(td->td_proc, RLIMIT_DATA));
PROC_UNLOCK(td->td_proc);
}
- do {
- if (flags & MAP_ANON) {
- /*
- * Mapping blank space is trivial.
- */
- handle = NULL;
- maxprot = VM_PROT_ALL;
- pos = 0;
- break;
- }
+ if (flags & MAP_ANON) {
+ /*
+ * Mapping blank space is trivial.
+ */
+ handle = NULL;
+ maxprot = VM_PROT_ALL;
+ pos = 0;
+ } else {
/*
* Mapping file, get fp for validation. Obtain vnode and make
* sure it is of appropriate type.
@@ -350,7 +348,7 @@
maxprot |= VM_PROT_WRITE;
}
handle = (void *)vp;
- } while (0);
+ }
/*
* Do not allow more then a certain number of vm_map_entry structures
More information about the p4-projects
mailing list