From 14e4cefcf8e71115be164967ea4eca69d4d00704 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sat, 16 Mar 2002 13:47:57 +0000
Subject: [PATCH] Hmm, talk about optimizer-fodder.  Make the DIOCGDVIRGIN hack
 work again.

---
 sys/geom/geom_dev.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index 1a94f189264..092378ac265 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -260,12 +260,10 @@ g_dev_ioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct thread *td)
 		error = g_io_getattr("GEOM::ioctl", cp, &i, gio, td);
 	g_free(gio);
 
-	if (error == 0) {
-		if (error != 0 && cmd == DIOCGDVIRGIN) {
-			g_topology_lock();
-			gp = g_create_geomf("BSD-method", cp->provider, NULL);
-			g_topology_unlock();
-		}
+	if (error != 0 && cmd == DIOCGDVIRGIN) {
+		g_topology_lock();
+		gp = g_create_geomf("BSD-method", cp->provider, NULL);
+		g_topology_unlock();
 	}
 	mtx_lock(&Giant);
 	g_rattle();