Index: sys/geom/geom_event.c
===================================================================
--- sys/geom/geom_event.c	(revision 214058)
+++ sys/geom/geom_event.c	(working copy)
@@ -127,8 +127,8 @@ g_orphan_provider(struct g_provider *pp,
 	    ("g_orphan_provider(%p(%s)), already an orphan", pp, pp->name));
 	pp->flags |= G_PF_ORPHAN;
 	TAILQ_INSERT_TAIL(&g_doorstep, pp, orphan);
-	mtx_unlock(&g_eventlock);
 	wakeup(&g_wait_event);
+	mtx_unlock(&g_eventlock);
 }
 
 /*
@@ -183,33 +183,27 @@ one_event(void)
 	struct g_event *ep;
 	struct g_provider *pp;
 
-	g_topology_lock();
-	for (;;) {
-		mtx_lock(&g_eventlock);
-		TAILQ_FOREACH(pp, &g_doorstep, orphan) {
-			if (pp->nstart == pp->nend)
-				break;
-		}
-		if (pp != NULL) {
-			G_VALID_PROVIDER(pp);
-			TAILQ_REMOVE(&g_doorstep, pp, orphan);
-		}
-		mtx_unlock(&g_eventlock);
-		if (pp == NULL)
+	g_topology_assert();
+	mtx_lock(&g_eventlock);
+	TAILQ_FOREACH(pp, &g_doorstep, orphan) {
+		if (pp->nstart == pp->nend)
 			break;
+	}
+	if (pp != NULL) {
+		G_VALID_PROVIDER(pp);
+		TAILQ_REMOVE(&g_doorstep, pp, orphan);
+		mtx_unlock(&g_eventlock);
 		g_orphan_register(pp);
+		return (1);
 	}
-	mtx_lock(&g_eventlock);
+
 	ep = TAILQ_FIRST(&g_events);
 	if (ep == NULL) {
 		wakeup(&g_pending_events);
-		mtx_unlock(&g_eventlock);
-		g_topology_unlock();
 		return (0);
 	}
 	if (ep->flag & EV_INPROGRESS) {
 		mtx_unlock(&g_eventlock);
-		g_topology_unlock();
 		return (1);
 	}
 	ep->flag |= EV_INPROGRESS;
@@ -227,7 +221,6 @@ one_event(void)
 	} else {
 		g_free(ep);
 	}
-	g_topology_unlock();
 	return (1);
 }
 
@@ -236,16 +229,27 @@ g_run_events()
 {
 	int i;
 
-	while (one_event())
-		;
-	g_topology_lock();
-	i = g_wither_work;
-	while (i) {
-		i = g_wither_washer();
-		g_wither_work = i & 1;
-		i &= 2;
+	for (;;) {
+		g_topology_lock();
+		while (one_event())
+			;
+		mtx_assert(&g_eventlock, MA_OWNED);
+		i = g_wither_work;
+		if (i) {
+			mtx_unlock(&g_eventlock);
+			while (i) {
+				i = g_wither_washer();
+				g_wither_work = i & 1;
+				i &= 2;
+			}
+			g_topology_unlock();
+		} else {
+			g_topology_unlock();
+			msleep(&g_wait_event, &g_eventlock, PRIBIO | PDROP,
+			    "-", 0);
+		}
 	}
-	g_topology_unlock();
+	/* NOTREACHED */
 }
 
 void
@@ -314,8 +318,8 @@ g_post_event_x(g_event_t *func, void *ar
 	ep->arg = arg;
 	mtx_lock(&g_eventlock);
 	TAILQ_INSERT_TAIL(&g_events, ep, events);
-	mtx_unlock(&g_eventlock);
 	wakeup(&g_wait_event);
+	mtx_unlock(&g_eventlock);
 	if (epp != NULL)
 		*epp = ep;
 	curthread->td_pflags |= TDP_GEOM;
@@ -337,10 +341,13 @@ g_post_event(g_event_t *func, void *arg,
 }
 
 void
-g_do_wither() {
+g_do_wither()
+{
 
 	g_wither_work = 1;
+	mtx_lock(&g_eventlock);
 	wakeup(&g_wait_event);
+	mtx_unlock(&g_eventlock);
 }
 
 /*
Index: sys/geom/geom_kern.c
===================================================================
--- sys/geom/geom_kern.c	(revision 214058)
+++ sys/geom/geom_kern.c	(working copy)
@@ -137,10 +137,8 @@ g_event_procbody(void)
 	thread_lock(tp);
 	sched_prio(tp, PRIBIO);
 	thread_unlock(tp);
-	for(;;) {
-		g_run_events();
-		tsleep(&g_wait_event, PRIBIO, "-", hz/10);
-	}
+	g_run_events();
+	/* NOTREACHED */
 }
 
 static struct kproc_desc g_event_kp = {