From owner-svn-src-projects@FreeBSD.ORG  Sat Feb  5 13:07:35 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6EDC3106566B;
	Sat,  5 Feb 2011 13:07:35 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5ED6E8FC13;
	Sat,  5 Feb 2011 13:07:35 +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 p15D7ZTc028677;
	Sat, 5 Feb 2011 13:07:35 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p15D7ZDq028675;
	Sat, 5 Feb 2011 13:07:35 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102051307.p15D7ZDq028675@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 5 Feb 2011 13:07:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218322 - projects/graid/head/sys/geom/raid
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Feb 2011 13:07:35 -0000

Author: mav
Date: Sat Feb  5 13:07:35 2011
New Revision: 218322
URL: http://svn.freebsd.org/changeset/base/218322

Log:
  Make sure that volume is closed before destroying transformation object.
  This guaranties that no requests are still running or will be running.

Modified:
  projects/graid/head/sys/geom/raid/g_raid.c

Modified: projects/graid/head/sys/geom/raid/g_raid.c
==============================================================================
--- projects/graid/head/sys/geom/raid/g_raid.c	Sat Feb  5 12:56:29 2011	(r218321)
+++ projects/graid/head/sys/geom/raid/g_raid.c	Sat Feb  5 13:07:35 2011	(r218322)
@@ -1706,13 +1706,13 @@ g_raid_destroy_volume(struct g_raid_volu
 		return (EBUSY);
 	if (vol->v_provider != NULL)
 		return (EBUSY);
+	if (vol->v_provider_open != 0)
+		return (EBUSY);
 	if (vol->v_tr) {
 		G_RAID_TR_FREE(vol->v_tr);
 		kobj_delete((kobj_t)vol->v_tr, M_RAID);
 		vol->v_tr = NULL;
 	}
-	if (vol->v_provider_open != 0)
-		return (EBUSY);
 	if (vol->v_rootmount)
 		root_mount_rel(vol->v_rootmount);
 	g_topology_lock();