From owner-svn-src-all@FreeBSD.ORG  Wed May  6 19:18:20 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0DC1F106564A;
	Wed,  6 May 2009 19:18:20 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F0B268FC0A;
	Wed,  6 May 2009 19:18:19 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n46JIJw3027246;
	Wed, 6 May 2009 19:18:19 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n46JIJG5027245;
	Wed, 6 May 2009 19:18:19 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200905061918.n46JIJG5027245@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Wed, 6 May 2009 19:18:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191855 - head/sys/geom/vinum
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 19:18:20 -0000

Author: lulf
Date: Wed May  6 19:18:19 2009
New Revision: 191855
URL: http://svn.freebsd.org/changeset/base/191855

Log:
  - Fix a case where a RAID5 volume would think that it is supposed to grow a new
    subdisk after a parity rebuild.

Modified:
  head/sys/geom/vinum/geom_vinum_subr.c

Modified: head/sys/geom/vinum/geom_vinum_subr.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum_subr.c	Wed May  6 19:06:28 2009	(r191854)
+++ head/sys/geom/vinum/geom_vinum_subr.c	Wed May  6 19:18:19 2009	(r191855)
@@ -127,7 +127,6 @@ gv_parse_config(struct gv_softc *sc, cha
 			 * needed here (on-disk config parsing).
 			 */
 			p->flags &= ~GV_PLEX_ADDED;
-			p->flags &= ~GV_PLEX_NEWBORN;
 
 		} else if (!strcmp(token[0], "sd")) {
 			s = gv_new_sd(tokens, token);
@@ -381,7 +380,7 @@ gv_sd_to_plex(struct gv_sd *s, struct gv
 		if ((p->org == GV_PLEX_RAID5 ||
 		    p->org == GV_PLEX_STRIPED) &&
 		    !(p->flags & GV_PLEX_NEWBORN) && 
-		    p->state >= GV_PLEX_DEGRADED) {
+		    p->state == GV_PLEX_UP) {
 			s->flags |= GV_SD_GROW;
 		}
 		p->sdcount++;