From owner-p4-projects@FreeBSD.ORG Thu Aug 4 08:22:52 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 CA3EA16A421; Thu, 4 Aug 2005 08:22:51 +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 7E0C616A41F for ; Thu, 4 Aug 2005 08:22:51 +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 4697643D45 for ; Thu, 4 Aug 2005 08:22:51 +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 j748MpQi060405 for ; Thu, 4 Aug 2005 08:22:51 GMT (envelope-from soc-cjones@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j748MoGZ060366 for perforce@freebsd.org; Thu, 4 Aug 2005 08:22:50 GMT (envelope-from soc-cjones@freebsd.org) Date: Thu, 4 Aug 2005 08:22:50 GMT Message-Id: <200508040822.j748MoGZ060366@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 81428 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, 04 Aug 2005 08:22:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=81428 Change 81428 by soc-cjones@soc-cjones_ishtar on 2005/08/04 07:59:34 Make _move compile. Affected files ... .. //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_move.c#2 edit Differences ... ==== //depot/projects/soc2005/gvinum/src/sys/geom/vinum/geom_vinum_move.c#2 (text+ko) ==== @@ -45,9 +45,9 @@ static int gv_move_sd(struct gv_softc *, struct gctl_req *, struct gv_sd *, char *, int); static int gv_move_vol(struct gv_softc *, struct gctl_req *, - struct gv_vol *, char *, int); + struct gv_volume *, char *, int); -void gv_move(struct g_geom *, struct gctl_req *) +void gv_move(struct g_geom *gp, struct gctl_req *req) { struct gv_softc *sc; struct gv_volume *v; @@ -84,7 +84,7 @@ gctl_error(req, "unknown volume '%s'", object); return; } - err = gv_move_vol(sc, req, v, *destination, *flags); + err = gv_move_vol(sc, req, v, destination, *flags); if (err) return; break; @@ -94,7 +94,7 @@ gctl_error(req, "unknown plex '%s'", object); return; } - err = gv_move_plex(sc, req, p, *destination, *flags); + err = gv_move_plex(sc, req, p, destination, *flags); if (err) return; break; @@ -104,7 +104,7 @@ gctl_error(req, "unknown subdisk '%s'", object); return; } - err = gv_move_sd(sc, req, s, *destination, *flags); + err = gv_move_sd(sc, req, s, destination, *flags); if (err) return; break; @@ -114,7 +114,7 @@ gctl_error(req, "unknown drive '%s'", object); return; } - err = gv_move_drive(sc, req, d, *destination, *flags); + err = gv_move_drive(sc, req, d, destination, *flags); if (err) return; break; @@ -129,27 +129,47 @@ /* Move a volume. */ static int -gv_move_vol(struct gv_softc *sc, struct gctl_req *req, struct gv_volume *v, char *destination, int flags) +gv_move_vol(struct gv_softc *sc, struct gctl_req *req, struct gv_volume *v, char *destination, int flags) { + int err; + + g_topology_assert(); + KASSERT(d != NULL, ("gv_move_vol: NULL v")); +} -} /* Move a plex. */ static int gv_move_plex(struct gv_softc *sc, struct gctl_req *req, struct gv_plex *p, char *destination, int flags) { + int err; + + g_topology_assert(); + KASSERT(d != NULL, ("gv_move_plex: NULL p")); + return (0); } + /* Move a subdisk. */ static int -gv_move_sd(struct gv_softc *sc, struct gctl_req *req, struct gv_subdisk *s, char *destination, int flags) +gv_move_sd(struct gv_softc *sc, struct gctl_req *req, struct gv_sd *s, char *destination, int flags) { + int err; + + g_topology_assert(); + KASSERT(d != NULL, ("gv_move_sd: NULL s")); + return (0); } /* Move a drive. */ static int gv_move_drive(struct gv_softc *sc, struct gctl_req *req, struct gv_drive *d, char *destination, int flags) { + int err; + + g_topology_assert(); + KASSERT(d != NULL, ("gv_move_drive: NULL d")); + return (0); }