From 668ae29c7105c2bb951be95ad769d5a7798a668c Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Wed, 23 Apr 2003 06:54:44 +0000
Subject: [PATCH] Remove unused event pointers in object structures. Remove
 KASSERTS which checked that they were unused.

---
 sys/geom/geom.h      | 6 ------
 sys/geom/geom_subr.c | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/sys/geom/geom.h b/sys/geom/geom.h
index f8e227bb57c9..f09972aa731a 100644
--- a/sys/geom/geom.h
+++ b/sys/geom/geom.h
@@ -49,7 +49,6 @@ struct g_class;
 struct g_geom;
 struct g_consumer;
 struct g_provider;
-struct g_event;
 struct g_stat;
 struct thread;
 struct bio;
@@ -95,14 +94,12 @@ struct g_class {
          */
 	LIST_ENTRY(g_class)	class;
 	LIST_HEAD(,g_geom)	geom;
-	struct g_event		*event;
 	u_int			protect;
 };
 
 #define G_CLASS_INITIALIZER 	\
 	.class = { 0, 0 },	\
 	.geom = { 0 },		\
-	.event = 0,		\
 	.protect = 0	
 
 /*
@@ -123,7 +120,6 @@ struct g_geom {
 	g_access_t		*access;
 	g_orphan_t		*orphan;
 	void			*softc;
-	struct g_event		*event;
 	unsigned		flags;
 #define	G_GEOM_WITHER		1
 };
@@ -152,7 +148,6 @@ struct g_consumer {
 	struct g_provider	*provider;
 	LIST_ENTRY(g_consumer)	consumers;	/* XXX: better name */
 	int			acr, acw, ace;
-	struct g_event		*event;
 	int			spoiled;
 	struct devstat		*stat;
 	u_int			nstart, nend;
@@ -169,7 +164,6 @@ struct g_provider {
 	LIST_HEAD(,g_consumer)	consumers;
 	int			acr, acw, ace;
 	int			error;
-	struct g_event		*event;
 	TAILQ_ENTRY(g_provider)	orphan;
 	u_int			index;
 	off_t			mediasize;
diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c
index a74cadb63551..54b03f92e273 100644
--- a/sys/geom/geom_subr.c
+++ b/sys/geom/geom_subr.c
@@ -110,7 +110,6 @@ g_destroy_geom(struct g_geom *gp)
 
 	g_trace(G_T_TOPOLOGY, "g_destroy_geom(%p(%s))", gp, gp->name);
 	g_topology_assert();
-	KASSERT(gp->event == NULL, ("g_destroy_geom() with event"));
 	KASSERT(LIST_EMPTY(&gp->consumer),
 	    ("g_destroy_geom(%s) with consumer(s) [%p]",
 	    gp->name, LIST_FIRST(&gp->consumer)));
@@ -149,7 +148,6 @@ g_destroy_consumer(struct g_consumer *cp)
 
 	g_trace(G_T_TOPOLOGY, "g_destroy_consumer(%p)", cp);
 	g_topology_assert();
-	KASSERT(cp->event == NULL, ("g_destroy_consumer() with event"));
 	KASSERT (cp->provider == NULL, ("g_destroy_consumer but attached"));
 	KASSERT (cp->acr == 0, ("g_destroy_consumer with acr"));
 	KASSERT (cp->acw == 0, ("g_destroy_consumer with acw"));
@@ -203,7 +201,6 @@ g_destroy_provider(struct g_provider *pp)
 	struct g_consumer *cp;
 
 	g_topology_assert();
-	KASSERT(pp->event == NULL, ("g_destroy_provider() with event"));
 	KASSERT(LIST_EMPTY(&pp->consumers),
 	    ("g_destroy_provider but attached"));
 	KASSERT (pp->acr == 0, ("g_destroy_provider with acr"));