Date: Mon, 15 Aug 2005 04:16:39 GMT From: soc-cjones <soc-cjones@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 82007 for review Message-ID: <200508150416.j7F4GdPs010388@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=82007 Change 82007 by soc-cjones@soc-cjones_ishtar on 2005/08/15 04:16:30 Some more RELENG_5_4 v. RELENG_5 stuff. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.c#4 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum.c#4 (text+ko) ==== @@ -57,7 +57,7 @@ struct g_geom *gp; struct gv_softc *sc; int error; - + g_topology_assert(); KASSERT(cp != NULL, ("gv_orphan: null cp")); @@ -136,6 +136,10 @@ g_trace(G_T_TOPOLOGY, "gv_taste(%s, %s)", mp->name, pp->name); g_topology_assert(); + /* XXX: This was in RELENG_5_4, but is not in RELENG_5. */ + if (pp->sectorsize == 0) + return (NULL); + /* Check if we already have a VINUM geom, or create a new one. */ if (LIST_EMPTY(&mp->geom)) { gp = g_new_geomf(mp, "VINUM"); @@ -156,6 +160,7 @@ gp = LIST_FIRST(&mp->geom); sc = gp->softc; } + /* We need a temporary consumer to read the config from. */ cp = g_new_consumer(gp); @@ -442,10 +447,8 @@ LIST_INSERT_HEAD(&sc->subdisks, s, sd); } - LIST_FOREACH(s, &sc->subdisks, sd) { + LIST_FOREACH(s, &sc->subdisks, sd) gv_update_sd_state(s); - printf("gv_create: LIST_FOREACH subdisk '%s', size %ld, drive '%s', avail %lld\n", s->name, (long) s->size, d->name, (long long) d->avail); - } LIST_FOREACH(p, &sc->plexes, plex) gv_update_plex_config(p); LIST_FOREACH(v, &sc->volumes, volume)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508150416.j7F4GdPs010388>