Track changes in sys/geom

4 files changed, 6 insertions, 24 deletions

diff --git a/tools/regression/geom/Test/T010/testprg.c b/tools/regression/geom/Test/T010/testprg.c
index 63237b2..1246054 100644
--- a/tools/regression/geom/Test/T010/testprg.c
+++ b/tools/regression/geom/Test/T010/testprg.c
@@ -71,26 +71,6 @@ thread_sim(void *ptr __unused)
 	rattle();
 	conff("1");
 	sdumpf("2");
-#if 0
-	g_simdisk_stop("ad0");
-	bp = g_new_bio();
-	bp->bio_cmd = BIO_READ;
-	bp->bio_offset = 0;
-	bp->bio_length = 512;
-	bp->bio_data = g_malloc(512, M_WAITOK);
-	g_dev_request("ad0s1a", bp);
-	rattle();
-	sdumpf("2a");
-	g_simdisk_destroy("ad0");
-	rattle();
-	conff("1");
-	sdumpf("2b");
-	g_simdisk_restart("ad0");
-	rattle();
-	conff("1");
-	sdumpf("2c");
-
-#endif
 	printf("Done\n");
 	done();
 	return (0);
diff --git a/tools/regression/geom/geom.c b/tools/regression/geom/geom.c
index 4a95458..1852cc4 100644
--- a/tools/regression/geom/geom.c
+++ b/tools/regression/geom/geom.c
@@ -46,6 +46,7 @@
 #include <sys/time.h>
 #include <sys/sbuf.h>
 #include <geom/geom.h>
+#include <geom/geom_int.h>
 
 void
 conff(char *file)
@@ -99,7 +100,7 @@ thread_event(void *ptr)
 	printf("Running %s\n", tp->name);
 	for (;;) {
 		usleep(100000);
-		g_run_events(tp);
+		g_run_events();
 		tsleep(&g_wait_event, 0, "events", 0);
 	}
 }
diff --git a/tools/regression/geom/geom_kernsim.c b/tools/regression/geom/geom_kernsim.c
index 7ab0617..de87bfc 100644
--- a/tools/regression/geom/geom_kernsim.c
+++ b/tools/regression/geom/geom_kernsim.c
@@ -46,6 +46,7 @@
 #include <sys/errno.h>
 #include <sys/time.h>
 #include <geom/geom.h>
+#include <geom/geom_int.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <machine/atomic.h>
diff --git a/tools/regression/geom/geom_simdev.c b/tools/regression/geom/geom_simdev.c
index fb015f0..290c8c5 100644
--- a/tools/regression/geom/geom_simdev.c
+++ b/tools/regression/geom/geom_simdev.c
@@ -49,7 +49,7 @@
 
 
 static struct g_geom *
-dev_taste(struct g_class *mp, struct g_provider *pp, struct thread *tp __unused, int insist __unused)
+dev_taste(struct g_class *mp, struct g_provider *pp, int insist __unused)
 {
 	struct g_geom *gp;
 	struct g_consumer *cp;
@@ -70,7 +70,7 @@ dev_taste(struct g_class *mp, struct g_provider *pp, struct thread *tp __unused,
 
 
 static void
-g_dev_orphan(struct g_consumer *cp, struct thread *tp __unused)
+g_dev_orphan(struct g_consumer *cp)
 {
 	struct g_geom *gp;
 
@@ -141,7 +141,7 @@ g_dev_done(struct bio *bp)
 	if (bp->bio_from->biocount > 0)
 		return;
 	g_topology_lock();
-	g_dev_orphan(bp->bio_from, NULL);
+	g_dev_orphan(bp->bio_from);
 	g_topology_unlock();
 }