From owner-svn-src-projects@FreeBSD.ORG  Fri Mar 20 09:02:40 2009
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 B84E6106566C;
	Fri, 20 Mar 2009 09:02:40 +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 A76058FC1F;
	Fri, 20 Mar 2009 09:02:40 +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 n2K92egG091619;
	Fri, 20 Mar 2009 09:02:40 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2K92eNk091618;
	Fri, 20 Mar 2009 09:02:40 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200903200902.n2K92eNk091618@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Fri, 20 Mar 2009 09:02:40 +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: r190137 - projects/gvinum/sys/geom/vinum
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: Fri, 20 Mar 2009 09:02:41 -0000

Author: lulf
Date: Fri Mar 20 09:02:40 2009
New Revision: 190137
URL: http://svn.freebsd.org/changeset/base/190137

Log:
  - Fix errors from previous mis-merges. The parity rebuild would end prematurely.

Modified:
  projects/gvinum/sys/geom/vinum/geom_vinum_plex.c

Modified: projects/gvinum/sys/geom/vinum/geom_vinum_plex.c
==============================================================================
--- projects/gvinum/sys/geom/vinum/geom_vinum_plex.c	Fri Mar 20 09:01:34 2009	(r190136)
+++ projects/gvinum/sys/geom/vinum/geom_vinum_plex.c	Fri Mar 20 09:02:40 2009	(r190137)
@@ -966,21 +966,21 @@ gv_parity_complete(struct gv_plex *p, st
 		g_free(bp->bio_data);
 	g_destroy_bio(bp);
 
-	if (error) {
+	if (error == EAGAIN) {
+		G_VINUM_DEBUG(0, "parity incorrect at offset 0x%jx",
+		    (intmax_t)p->synced);
+	}
+
+	/* Any error is fatal, except EAGAIN when we're rebuilding. */
+	if (error && !(error == EAGAIN && (flags & GV_BIO_PARITY))) {
 		/* Make sure we don't have the lock. */
 		g_topology_assert_not();
 		g_topology_lock();
 		gv_access(p->vol_sc->provider, -1, -1, 0);
 		g_topology_unlock();
-
-		if (error == EAGAIN) {
-			G_VINUM_DEBUG(0, "parity incorrect at offset 0x%jx",
-			    (intmax_t)p->synced);
-			if (!(flags & GV_BIO_PARITY))
-				return;
-		}
-		G_VINUM_DEBUG(0, "parity check on %s failed at 0x%jx errno %d",
-		    p->name, (intmax_t)p->synced, error);
+		G_VINUM_DEBUG(0, "parity check on %s failed at 0x%jx "
+		    "errno %d", p->name, (intmax_t)p->synced, error);
+		return;
 	} else {
 		p->synced += p->stripesize;
 	}
@@ -991,7 +991,6 @@ gv_parity_complete(struct gv_plex *p, st
 		g_topology_lock();
 		gv_access(p->vol_sc->provider, -1, -1, 0);
 		g_topology_unlock();
-
 		/* We're finished. */
 		G_VINUM_DEBUG(1, "parity operation on %s finished", p->name);
 		p->synced = 0;