From owner-p4-projects@FreeBSD.ORG  Tue Aug  9 07:59:55 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 2840916A421; Tue,  9 Aug 2005 07:59:55 +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 F0A7A16A41F
	for <perforce@freebsd.org>; Tue,  9 Aug 2005 07:59:54 +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 BC49443D46
	for <perforce@freebsd.org>; Tue,  9 Aug 2005 07:59:54 +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 j797xsx0093607
	for <perforce@freebsd.org>; Tue, 9 Aug 2005 07:59:54 GMT
	(envelope-from soc-cjones@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j797xsfo093604
	for perforce@freebsd.org; Tue, 9 Aug 2005 07:59:54 GMT
	(envelope-from soc-cjones@freebsd.org)
Date: Tue, 9 Aug 2005 07:59:54 GMT
Message-Id: <200508090759.j797xsfo093604@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 81713 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 07:59:56 -0000

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

Change 81713 by soc-cjones@soc-cjones_ishtar on 2005/08/09 07:59:24

	Broken --- we're unable to correctly remove the temporary subdisk.

Affected files ...

.. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_move.c#5 edit

Differences ...

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

@@ -78,8 +78,11 @@
 	for (i = 0; i < *argc; i++) {
 		snprintf(buf, sizeof(buf), "argv%d", i);
 		object = gctl_get_param(req, buf, NULL);
+		printf("%s -> %s\n", buf, object);
 		if (NULL == object)
-			continue;
+		  continue;
+		if (0 == i)
+		  continue;
 		type = gv_object_type(sc, object);
 		switch (type) {
 		case GV_TYPE_VOL:
@@ -122,7 +125,7 @@
 				gctl_error(req, "unknown drive '%s'", object);
 				return;
 			}
-			gctl_err(req, "no touching drives!");
+			gctl_error(req, "no touching drives!");
 			return 1;
 			err = gv_move_drive(sc, req, d, destination, *flags);
 			if (err)
@@ -200,6 +203,7 @@
 	printf("B (s2->name = %s)\n", s2->name);
 	s2->size = s->size;
 	printf("C\n");
+	strncpy(s2->drive, d->name, GV_MAXSDNAME);
 	s2->drive_sc = d;
 	s2->drive_offset = -1;
 	s2->plex_offset = -1;
@@ -223,6 +227,7 @@
 	gv_update_sd_state(s);
 	printf("J\n");
 	gv_save_config_all(sc);
+	printf("K\n");
 
 	/* TODO -- move data from old sd to new sd. */
 	/* TODO -- delete old sd. */