Change events to have an array of "void *" references, and give the

event posting functions varargs to fill these.

Attribute g_call_me() to appropriate g_geom's where necessary.

Add a flag argument to g_call_me() methods which will be used to signal
cancellation of events in the future.

This commit should be a no-op.

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 7d5b677..7ffd464 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -294,7 +294,7 @@ g_disk_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g
 }
 
 static void
-g_disk_create(void *arg)
+g_disk_create(void *arg, int flag __unused)
 {
 	struct g_geom *gp;
 	struct g_provider *pp;
@@ -335,7 +335,7 @@ disk_create(int unit, struct disk *dp, int flags, void *unused __unused, void *
 	dp->d_devstat = devstat_new_entry(dp->d_name, dp->d_unit,
 	    dp->d_sectorsize, DEVSTAT_ALL_SUPPORTED,
 	    DEVSTAT_TYPE_DIRECT, DEVSTAT_PRIORITY_MAX);
-	g_call_me(g_disk_create, dp);
+	g_call_me(g_disk_create, dp, dp, NULL);
 }
 
 void
@@ -351,7 +351,7 @@ disk_destroy(struct disk *dp)
 }
 
 static void
-g_kern_disks(void *p)
+g_kern_disks(void *p, int flag __unused)
 {
 	struct sbuf *sb;
 	struct g_geom *gp;
@@ -376,7 +376,7 @@ sysctl_disks(SYSCTL_HANDLER_ARGS)
 
 	sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
 	sbuf_clear(sb);
-	error = g_call_me(g_kern_disks, sb);
+	error = g_call_me(g_kern_disks, sb, NULL);
 	while (!error && !sbuf_done(sb)) {
 		tsleep(sb, PZERO, "kern.disks", hz);
 	}