PERFORCE change 167873 for review

[Marko Zec]

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

Change 167873 by zec at zec_tpx32 on 2009/08/27 08:13:11

	Push VNET_SYSINIT locking inside vnet_sysinit() and
	vnet_sysuninit() functions.
	Suggested by:	jhb

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/net/vnet.c#7 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/net/vnet.c#7 (text+ko) ====

@@ -247,9 +247,7 @@
 
 	/* Initialize / attach vnet module instances. */
 	CURVNET_SET_QUIET(vnet);
-	VNET_SYSINIT_RLOCK();
 	vnet_sysinit();
-	VNET_SYSINIT_RUNLOCK();
 	CURVNET_RESTORE();
 
 	VNET_LIST_WLOCK();
@@ -282,9 +280,7 @@
 			if_vmove(ifp, ifp->if_home_vnet);
 	}
 
-	VNET_SYSINIT_RLOCK();
 	vnet_sysuninit();
-	VNET_SYSINIT_RUNLOCK();
 	CURVNET_RESTORE();
 
 	/*
@@ -607,10 +603,11 @@
 {
 	struct vnet_sysinit *vs;
 
-	sx_assert(&vnet_sysinit_sxlock, SA_LOCKED);
+	VNET_SYSINIT_RLOCK();
 	TAILQ_FOREACH(vs, &vnet_constructors, link) {
 		vs->func(vs->arg);
 	}
+	VNET_SYSINIT_RUNLOCK();
 }
 
 /*
@@ -623,11 +620,12 @@
 {
 	struct vnet_sysinit *vs;
 
-	sx_assert(&vnet_sysinit_sxlock, SA_LOCKED);
+	VNET_SYSINIT_RLOCK();
 	TAILQ_FOREACH_REVERSE(vs, &vnet_destructors, vnet_sysuninit_head,
 	    link) {
 		vs->func(vs->arg);
 	}
+	VNET_SYSINIT_RUNLOCK();
 }
 
 #ifdef DDB