From owner-svn-src-projects@FreeBSD.ORG  Mon Feb  7 15:30:11 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 C16C7106564A;
	Mon,  7 Feb 2011 15:30:11 +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 B10EF8FC1B;
	Mon,  7 Feb 2011 15:30:11 +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 p17FUBvg013717;
	Mon, 7 Feb 2011 15:30:11 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p17FUBrb013714;
	Mon, 7 Feb 2011 15:30:11 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201102071530.p17FUBrb013714@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 7 Feb 2011 15:30:11 +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: r218404 - 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: Mon, 07 Feb 2011 15:30:11 -0000

Author: mav
Date: Mon Feb  7 15:30:11 2011
New Revision: 218404
URL: http://svn.freebsd.org/changeset/base/218404

Log:
  Block metadata writing when active array destruction started. Otherwise
  we have real chances to write something half-destroyed.

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

Modified: projects/graid/head/sys/geom/raid/g_raid.c
==============================================================================
--- projects/graid/head/sys/geom/raid/g_raid.c	Mon Feb  7 15:18:36 2011	(r218403)
+++ projects/graid/head/sys/geom/raid/g_raid.c	Mon Feb  7 15:30:11 2011	(r218404)
@@ -1918,6 +1918,8 @@ void g_raid_write_metadata(struct g_raid
     struct g_raid_subdisk *sd, struct g_raid_disk *disk)
 {
 
+	if (sc->sc_stopping == G_RAID_DESTROY_HARD)
+		return;
 	if (sc->sc_md)
 		G_RAID_MD_WRITE(sc->sc_md, vol, sd, disk);
 }

Modified: projects/graid/head/sys/geom/raid/md_intel.c
==============================================================================
--- projects/graid/head/sys/geom/raid/md_intel.c	Mon Feb  7 15:18:36 2011	(r218403)
+++ projects/graid/head/sys/geom/raid/md_intel.c	Mon Feb  7 15:30:11 2011	(r218404)
@@ -1972,6 +1972,9 @@ g_raid_md_write_intel(struct g_raid_md_o
 	sc = md->mdo_softc;
 	mdi = (struct g_raid_md_intel_object *)md;
 
+	if (sc->sc_stopping == G_RAID_DESTROY_HARD)
+		return (0);
+
 	/* Bump generation. Newly written metadata may differ from previous. */
 	mdi->mdio_generation++;