PERFORCE change 161248 for review

Marko Zec zec at FreeBSD.org
Tue Apr 28 13:28:53 UTC 2009


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

Change 161248 by zec at zec_amdx2 on 2009/04/28 13:28:28

	VIMAGE kernel now boots multiuser...

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#16 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#19 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#16 (text+ko) ====

@@ -286,8 +286,8 @@
 	so->so_gencnt = ++so_gencnt;
 	++numopensockets;
 #ifdef VIMAGE
-	++vnet->sockcnt;
-	so->so_vnet = curvnet;
+	++vnet->sockcnt;	/* locked with so_global_mtx */
+	so->so_vnet = vnet;
 #endif
 	mtx_unlock(&so_global_mtx);
 	return (so);

==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#19 (text+ko) ====

@@ -227,7 +227,7 @@
 	 */
 	callout_init(&V_tcp_hc_callout, CALLOUT_MPSAFE);
 	callout_reset(&V_tcp_hc_callout, V_tcp_hostcache.prune * hz,
-	    tcp_hc_purge, 0);
+	    tcp_hc_purge, curvnet);
 }
 
 /*
@@ -636,7 +636,7 @@
 {
 	INIT_VNET_INET(curvnet);
 	struct hc_metrics *hc_entry, *hc_next;
-	int all = (intptr_t)arg;
+	int all = 0;	/* XXX was: (intptr_t)arg - makes no sense? */
 	int i;
 
 	if (V_tcp_hostcache.purgeall) {


More information about the p4-projects mailing list