From 43f0db6cc5a46feadcfdf4acedcb961e697a106d Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sun, 25 May 2003 16:57:10 +0000
Subject: [PATCH] Don't do silly thing if the disk_create() event gets
 canceled.

Approved by:	re/scottl
---
 sys/geom/geom_disk.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 84ca4098c87..83d55b2c2e8 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -295,12 +295,14 @@ g_disk_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g
 }
 
 static void
-g_disk_create(void *arg, int flag __unused)
+g_disk_create(void *arg, int flag)
 {
 	struct g_geom *gp;
 	struct g_provider *pp;
 	struct disk *dp;
 
+	if (flag == EV_CANCEL)
+		return;
 	g_topology_assert();
 	dp = arg;
 	gp = g_new_geomf(&g_disk_class, "%s%d", dp->d_name, dp->d_unit);