PERFORCE change 82006 for review

[soc-cjones]

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

Change 82006 by soc-cjones at soc-cjones_ishtar on 2005/08/15 04:11:01

	Some stuff in RELENG_5 but not in RELENG_5_4 breaks writing gvinum configs to disk.  Go figure.  Anyways, this fixes that.  Perhaps RELENG_6 unbreaks things better.

Affected files ...

.. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_drive.c#2 edit

Differences ...

==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_drive.c#2 (text+ko) ====

@@ -113,8 +113,9 @@
 	KASSERT(d != NULL, ("gv_save_config: null d"));
 	KASSERT(sc != NULL, ("gv_save_config: null sc"));
 
-	if (d->state != GV_DRIVE_UP)
-		return;
+	/* XXX: This is in RELENG_5, but was not in RELENG_5_4. */
+	/* if (d->state != GV_DRIVE_UP)
+	   	return; */
 
 	if (cp == NULL) {
 		gp = d->geom;
@@ -146,7 +147,8 @@
 		printf("GEOM_VINUM: g_access failed on drive %s, errno %d\n",
 		    d->name, error);
 		sbuf_delete(sb);
-		g_free(vhdr);
+		/* XXX: this was in RELENG_5, but not RELENG_5_4 */
+		/* g_free(vhdr); */
 		return;
 	}
 	g_topology_unlock();
@@ -200,8 +202,9 @@
 		return (0);
 
 	d = gp->softc;
-	if (d == NULL)
-		return (0);
+	/* XXX: this was in RELENG_5, but not RELENG_5_4. */
+	/* if (d == NULL)
+		return (0); */
 
 	s = pp->private;
 	KASSERT(s != NULL, ("gv_drive_access: NULL s"));