From owner-p4-projects@FreeBSD.ORG Fri Dec 8 00:05:13 2006 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 EA36716A47E; Fri, 8 Dec 2006 00:05:12 +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 9D41416A526 for ; Fri, 8 Dec 2006 00:05:12 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8A6643DEF for ; Fri, 8 Dec 2006 00:03:50 +0000 (GMT) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB804iao098152 for ; Fri, 8 Dec 2006 00:04:44 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB804i6o098149 for perforce@freebsd.org; Fri, 8 Dec 2006 00:04:44 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 8 Dec 2006 00:04:44 GMT Message-Id: <200612080004.kB804i6o098149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 111268 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: Fri, 08 Dec 2006 00:05:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=111268 Change 111268 by mjacob@newisp on 2006/12/08 00:04:01 Undo the damage from an unintended commit. Affected files ... .. //depot/projects/newisp/conf/NOTES#16 edit .. //depot/projects/newisp/conf/options#10 edit .. //depot/projects/newisp/geom/stripe/g_stripe.c#4 edit .. //depot/projects/newisp/geom/stripe/g_stripe.h#3 edit Differences ... ==== //depot/projects/newisp/conf/NOTES#16 (text+ko) ==== @@ -110,21 +110,6 @@ # options BLKDEV_IOSIZE=8192 -# -# MAXPHYS and DFLTPHYS -# -# These are the max and default 'raw' I/O block device access sizes. -# Reads and writes will be split into DFLTPHYS chunks. Some applications -# have better performance with larger raw I/O access sizes. Typically -# MAXPHYS should be twice the size of DFLTPHYS. Note that certain VM -# parameters are derived from these values and making them too large -# can make an an unbootable kernel. -# -# The defaults are 64K and 128K respectively. -options DFLTPHYS=(64*1024) -options MAXPHYS=(128*1024) - - # Options for the VM subsystem # Deprecated options supported for backwards compatibility #options PQ_NOOPT # No coloring ==== //depot/projects/newisp/conf/options#10 (text+ko) ==== @@ -535,8 +535,6 @@ # These cause changes all over the kernel BLKDEV_IOSIZE opt_global.h -MAXPHYS opt_global.h -DFLTPHYS opt_global.h BURN_BRIDGES opt_global.h DEBUG opt_global.h DEBUG_LOCKS opt_global.h ==== //depot/projects/newisp/geom/stripe/g_stripe.c#4 (text+ko) ==== @@ -839,12 +839,6 @@ gp->softc = sc; sc->sc_geom = gp; sc->sc_provider = NULL; - /* - * Create a devstat entry for this stripe (always unit zero). - * Sectorsize is system block size in this case. - */ - sc->sc_devstat = devstat_new_entry(md->md_name, 0, - 512 /* XXX WHICH DEFINE? XXXX */ , DEVSTAT_ALL_SUPPORTED, DEVSTAT_TYPE_DIRECT, DEVSTAT_PRIORITY_MAX); G_STRIPE_DEBUG(0, "Device %s created (id=%u).", sc->sc_name, sc->sc_id); @@ -886,9 +880,6 @@ KASSERT(sc->sc_provider == NULL, ("Provider still exists? (device=%s)", gp->name)); free(sc->sc_disks, M_STRIPE); - if (sc->sc_devstat) { - devstat_remove_entry(sc->sc_devstat); - } free(sc, M_STRIPE); pp = LIST_FIRST(&gp->provider); ==== //depot/projects/newisp/geom/stripe/g_stripe.h#3 (text+ko) ==== @@ -67,7 +67,6 @@ } \ } while (0) -struct devstat; struct g_stripe_softc { u_int sc_type; /* provider type */ struct g_geom *sc_geom; @@ -77,7 +76,6 @@ uint16_t sc_ndisks; uint32_t sc_stripesize; uint32_t sc_stripebits; - struct devstat *sc_devstat; }; #define sc_name sc_geom->name #endif /* _KERNEL */