From a27d539c9ac7b17319630c5b530429562f22145c Mon Sep 17 00:00:00 2001
From: jh <jh@FreeBSD.org>
Date: Mon, 10 May 2010 19:08:53 +0000
Subject: In g_zero_destroy_geom(), return 0 instead of EBUSY in the success
 case. EBUSY was probably used as a workaround for the deadlock fixed in
 r207671.

Approved by:	pjd
X-MFC after:	r207671
---
 sys/geom/zero/g_zero.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sys/geom')

diff --git a/sys/geom/zero/g_zero.c b/sys/geom/zero/g_zero.c
index 638bd32..b8899e7 100644
--- a/sys/geom/zero/g_zero.c
+++ b/sys/geom/zero/g_zero.c
@@ -104,7 +104,7 @@ g_zero_destroy_geom(struct gctl_req *req __unused, struct g_class *mp __unused,
 	if (pp->acr > 0 || pp->acw > 0 || pp->ace > 0)
 		return (EBUSY);
 	g_wither_geom(gp, ENXIO);
-	return (EBUSY);
+	return (0);
 }
 
 static struct g_class g_zero_class = {
-- 
cgit v1.1