PERFORCE change 81700 for review

[soc-cjones]

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

Change 81700 by soc-cjones at soc-cjones_ishtar on 2005/08/09 03:04:48

	Fix kasserts to actually be, well, useful.

Affected files ...

.. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#6 edit

Differences ...

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

@@ -166,7 +166,7 @@
 	struct gv_sd *s;
 
 	g_topology_assert();
-	KASSERT(d != NULL, ("gv_rename_plex: NULL p"));
+	KASSERT(p != NULL, ("gv_rename_plex: NULL p"));
 
 	if (-1 != gv_object_type(sc, newname)) {
 	  gctl_error(req, "plex name %s already in use", newname);
@@ -222,7 +222,7 @@
 	char *poldsdnumber = oldsdnumber;
 
 	g_topology_assert();
-	KASSERT(d != NULL, ("gv_rename_sd: NULL s"));
+	KASSERT(s != NULL, ("gv_rename_sd: NULL s"));
 
 	if (-1 != gv_object_type(sc, newname)) {
 	  gctl_error(req, "subdrive name %s already in use", newname);
@@ -251,11 +251,10 @@
 {
 	int err;
 	struct gv_plex *p;
-	/*	struct gv_sd *s; */
 	char oldvolname[GV_MAXVOLNAME];
 
 	g_topology_assert();
-	KASSERT(d != NULL, ("gv_rename_vol: NULL v"));
+	KASSERT(v != NULL, ("gv_rename_vol: NULL v"));
 
 	if (-1 != gv_object_type(sc, newname)) {
 	  gctl_error(req, "volume name %s already in use", newname);