From owner-svn-src-stable-8@FreeBSD.ORG  Sun Aug  8 09:06:59 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E7ED01065676;
	Sun,  8 Aug 2010 09:06:59 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D6E388FC22;
	Sun,  8 Aug 2010 09:06:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7896xUq017801;
	Sun, 8 Aug 2010 09:06:59 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7896xOv017799;
	Sun, 8 Aug 2010 09:06:59 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201008080906.o7896xOv017799@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Sun, 8 Aug 2010 09:06:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211064 - stable/8/sys/geom/zero
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Aug 2010 09:07:00 -0000

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 = {