From owner-p4-projects@FreeBSD.ORG Mon Aug 8 08:17:50 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C07C16A41F; Mon, 8 Aug 2005 08:17:49 +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 933B716A41F for ; Mon, 8 Aug 2005 08:17:49 +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 56AD243D45 for ; Mon, 8 Aug 2005 08:17:49 +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 j788HnNN094704 for ; Mon, 8 Aug 2005 08:17:49 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j788Hml4094696 for perforce@freebsd.org; Mon, 8 Aug 2005 08:17:48 GMT (envelope-from soc-cjones@freebsd.org) Date: Mon, 8 Aug 2005 08:17:48 GMT Message-Id: <200508080817.j788Hml4094696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-cjones@freebsd.org using -f From: soc-cjones To: Perforce Change Reviews Cc: Subject: PERFORCE change 81639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Aug 2005 08:17:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=81639 Change 81639 by soc-cjones@soc-cjones_ishtar on 2005/08/08 08:17:46 Get rid of excess debugging cruft that's no longer needed. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#5 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_rename.c#5 (text+ko) ==== @@ -146,6 +146,7 @@ LIST_FOREACH(s, &sc->subdisks, sd) { if (!strncmp(s->drive, olddrivename, GV_MAXDRIVENAME)) { + printf("Fixing drive reference for subdisk %s from %s to %s\n", s->name, s->drive, d->name); strncpy(s->drive, d->name, GV_MAXDRIVENAME); } } @@ -286,69 +287,12 @@ strsep(&poldplexname, "."); snprintf(newplexname, GV_MAXPLEXNAME, "%s.%s", v->name, poldplexname); if ((err = gv_rename_plex(sc, req, p, newplexname, flags))) - return err; - - /* - char plexnumber[GV_MAXPLEXNAME]; - char *pplexnumber = plexnumber; - printf("Modifying plex %s, p->volume = %s\n", p->name, p->volume); - strncpy(oldplexname, p->name, GV_MAXPLEXNAME); - strncpy(plexnumber, p->name, GV_MAXPLEXNAME); - strsep(&pplexnumber, "."); - printf("Renaming plex %s to %s.%s\n", p->name, v->name, pplexnumber); - snprintf(p->name, GV_MAXPLEXNAME, "%s.%s", v->name, pplexnumber); - LIST_FOREACH(s, &sc->subdisks, sd) { - if (!strncmp(s->plex, oldplexname, GV_MAXPLEXNAME)) { - char sdnumber[GV_MAXSDNAME]; - char *psdnumber = sdnumber; - printf("Modifying subdisk %s, s->plex = %s\n", s->name, s->plex); - strncpy(sdnumber, s->name, GV_MAXSDNAME); - strsep(&psdnumber, "."); - strsep(&psdnumber, "."); - printf("Renaming subdisk %s to %s.%s\n", s->name, p->name, psdnumber); - snprintf(s->name, GV_MAXSDNAME, "%s.%s", p->name, psdnumber); - strncpy(s->plex, p->name, GV_MAXPLEXNAME); - } else { - printf("Ignoring subdisk %s, s->plex = %s\n", s->name, s->plex); - } - } - */ + return err; } - } else { + } else { printf("Ignoring plex %s, p->volume = %s\n", p->name, p->volume); } } - - /* - printf("Debugging output:\n"); - printf("\tsc = %p\n", sc); - printf("\treq = %p\n", req); - printf("\tv = %p\n", v); - printf("\t\tv->name = %s\n", v->name); - printf("\t\tv->size = %d\n", (int) v->size); - printf("\t\tv->plexcount = %d\n", v->plexcount); - printf("\tnewname = \"%s\"\n", newname); - printf("\tflags = %x\n", flags); - - LIST_FOREACH(p, &sc->plexes, plex) { - if (!strncmp(p->volume, v->name, GV_MAXVOLNAME)) { - printf("\tp->name = %s\n", p->name); - printf("\tp->size = %d\n", (int) p->size); - printf("\tp->volume = %s\n", p->volume); - printf("\tp->sdcount = %d\n", p->sdcount); - printf("\tp->sddown = %d\n", p->sddown); - LIST_FOREACH(s, &sc->subdisks, sd) { - if (!strncmp(s->plex, p->name, GV_MAXPLEXNAME)) { - printf("\t\ts->name = %s\n", s->name); - printf("\t\ts->size = %d\n", (int) s->size); - printf("\t\ts->drive = %s\n", s->drive); - printf("\t\ts->plex = %s\n", s->plex); - } - } - } - } - printf("\n\n"); - */ - + return (0); }