svn commit: r211064 - stable/8/sys/geom/zero

[Jaakko Heinonen]

Author: jh
Date: Sun Aug  8 09:06:59 2010
New Revision: 211064
URL: http://svn.freebsd.org/changeset/base/211064

Log:
  MFC r207877:
  
  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.

Modified:
  stable/8/sys/geom/zero/g_zero.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cam/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/geom/zero/g_zero.c
==============================================================================
--- stable/8/sys/geom/zero/g_zero.c	Sun Aug  8 08:43:01 2010	(r211063)
+++ stable/8/sys/geom/zero/g_zero.c	Sun Aug  8 09:06:59 2010	(r211064)
@@ -104,7 +104,7 @@ g_zero_destroy_geom(struct gctl_req *req
 	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 = {