From owner-p4-projects@FreeBSD.ORG  Tue Aug  9 03:05:32 2005
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 40FB916A421; Tue,  9 Aug 2005 03:05:32 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 03E6C16A41F
	for <perforce@freebsd.org>; Tue,  9 Aug 2005 03:05:32 +0000 (GMT)
	(envelope-from soc-cjones@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C47DD43D45
	for <perforce@freebsd.org>; Tue,  9 Aug 2005 03:05:31 +0000 (GMT)
	(envelope-from soc-cjones@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j7935Vwf076316
	for <perforce@freebsd.org>; Tue, 9 Aug 2005 03:05:31 GMT
	(envelope-from soc-cjones@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7935VZ5076311
	for perforce@freebsd.org; Tue, 9 Aug 2005 03:05:31 GMT
	(envelope-from soc-cjones@freebsd.org)
Date: Tue, 9 Aug 2005 03:05:31 GMT
Message-Id: <200508090305.j7935VZ5076311@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	soc-cjones@freebsd.org using -f
From: soc-cjones <soc-cjones@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 81700 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, 09 Aug 2005 03:05:33 -0000

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

Change 81700 by soc-cjones@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);