From owner-p4-projects@FreeBSD.ORG  Tue Feb 27 03:48:54 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 57FA916A407; Tue, 27 Feb 2007 03:48:54 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2F4C216A401
	for <perforce@freebsd.org>; Tue, 27 Feb 2007 03:48:54 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 219F113C428
	for <perforce@freebsd.org>; Tue, 27 Feb 2007 03:48:54 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l1R3msqH082450
	for <perforce@freebsd.org>; Tue, 27 Feb 2007 03:48:54 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l1R3mrEw082447
	for perforce@freebsd.org; Tue, 27 Feb 2007 03:48:53 GMT
	(envelope-from mjacob@freebsd.org)
Date: Tue, 27 Feb 2007 03:48:53 GMT
Message-Id: <200702270348.l1R3mrEw082447@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 115100 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Feb 2007 03:48:54 -0000

http://perforce.freebsd.org/chv.cgi?CH=115100

Change 115100 by mjacob@mjexp on 2007/02/27 03:48:08

	Minor cleanups.

Affected files ...

.. //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#14 edit

Differences ...

==== //depot/projects/mjexp/sys/geom/multipath/g_multipath.c#14 (text+ko) ====

@@ -158,11 +158,11 @@
 static void
 g_multipath_done_error(struct bio *bp)
 {
-	struct bio *pbp = bp->bio_parent;
-	struct g_geom *gp = pbp->bio_to->geom;
-	struct g_multipath_softc *sc = gp->softc;
-	struct g_consumer *cp = bp->bio_from;
-	struct g_provider *pp = cp->provider;
+	struct bio *pbp;
+	struct g_geom *gp;
+	struct g_multipath_softc *sc;
+	struct g_consumer *cp;
+	struct g_provider *pp;
 
 	/*
 	 * If we had a failure, we have to check first to see
@@ -173,6 +173,12 @@
 	 */
 
 	g_topology_lock();
+	pbp = bp->bio_parent;
+	gp = pbp->bio_to->geom;
+	sc = gp->softc;
+	cp = bp->bio_from;
+	pp = cp->provider;
+
 	cp->index |= MP_BAD;
 	if (cp->nend == cp->nstart && pp->nend == pp->nstart) {
 		cp->index |= MP_POSTED;
@@ -228,7 +234,7 @@
 			g_multipath_done_error(bp);
 			mtx_lock(&gmtbq_mtx);
 		}
-		msleep(&g_multipath_kt_state, &gmtbq_mtx,PRIBIO,
+		msleep(&g_multipath_kt_state, &gmtbq_mtx, PRIBIO,
 		    "gkt:wait", hz / 10);
 	}
 	mtx_unlock(&gmtbq_mtx);