PERFORCE change 115100 for review

[Matt Jacob]

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

Change 115100 by mjacob at 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);