From owner-p4-projects@FreeBSD.ORG Thu Jun 28 13:01:46 2007 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 1A69216A517; Thu, 28 Jun 2007 13:01:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 91F2016A473 for ; Thu, 28 Jun 2007 13:01:45 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 826F113C448 for ; Thu, 28 Jun 2007 13:01:45 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SD1j2T064448 for ; Thu, 28 Jun 2007 13:01:45 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SD1jiS064445 for perforce@freebsd.org; Thu, 28 Jun 2007 13:01:45 GMT (envelope-from lulf@FreeBSD.org) Date: Thu, 28 Jun 2007 13:01:45 GMT Message-Id: <200706281301.l5SD1jiS064445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122486 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: Thu, 28 Jun 2007 13:01:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=122486 Change 122486 by lulf@lulf_carrot on 2007/06/28 13:00:56 - Style(9) changes. - Add comment. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#6 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_move.c#3 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#8 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#14 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#10 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#6 (text+ko) ==== @@ -148,8 +148,6 @@ g_detach(cp); g_destroy_consumer(cp); g_topology_unlock(); - - return; } /* ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_move.c#3 (text+ko) ==== @@ -109,12 +109,14 @@ d = cursd->drive_sc; + /* XXX: Can't do a move without unmounting. Perhaps okay. */ if (gv_consumer_is_open(d->consumer) || gv_consumer_is_open(destination->consumer)) { printf("VINUM: consumers on current and destination drive " - " still open"); + " still open\n"); return (GV_ERR_ISOPEN); } + if (!(flags && GV_FLAG_F)) { printf("VINUM: -f flag not passed; move would be " "destructive\n"); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#8 (text+ko) ==== @@ -217,8 +217,6 @@ g_orphan_provider(pp, ENXIO); g_topology_unlock(); } - - return; } /* Remove a plex. */ @@ -256,8 +254,6 @@ } g_free(p); - - return; } /* Remove a subdisk. */ @@ -290,8 +286,6 @@ LIST_REMOVE(s, sd); gv_free_sd(s); g_free(s); - - return; } /* Remove a drive. */ @@ -357,6 +351,4 @@ g_free(d); gv_save_config(sc); - - return; } ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#14 (text+ko) ==== @@ -227,8 +227,6 @@ sbuf_printf(sb, " state %s", gv_sdstate(s->state)); sbuf_printf(sb, "\n"); } - - return; } static off_t ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#10 (text+ko) ==== @@ -115,8 +115,6 @@ } break; } - - return; } void