From owner-svn-src-user@FreeBSD.ORG Fri Feb 15 14:53:42 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CE072B5C; Fri, 15 Feb 2013 14:53:42 +0000 (UTC) (envelope-from attilio@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id B6CE6147; Fri, 15 Feb 2013 14:53:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1FErgT2085553; Fri, 15 Feb 2013 14:53:42 GMT (envelope-from attilio@svn.freebsd.org) Received: (from attilio@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1FErgri085552; Fri, 15 Feb 2013 14:53:42 GMT (envelope-from attilio@svn.freebsd.org) Message-Id: <201302151453.r1FErgri085552@svn.freebsd.org> From: Attilio Rao Date: Fri, 15 Feb 2013 14:53:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r246836 - user/attilio/vmc-playground/sys/vm X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Feb 2013 14:53:42 -0000 Author: attilio Date: Fri Feb 15 14:53:42 2013 New Revision: 246836 URL: http://svnweb.freebsd.org/changeset/base/246836 Log: Move the radix node zone destructor definition closer to vm_radix_init() definition. Sponsored by: EMC / Isilon storage division Modified: user/attilio/vmc-playground/sys/vm/vm_radix.c Modified: user/attilio/vmc-playground/sys/vm/vm_radix.c ============================================================================== --- user/attilio/vmc-playground/sys/vm/vm_radix.c Fri Feb 15 14:50:36 2013 (r246835) +++ user/attilio/vmc-playground/sys/vm/vm_radix.c Fri Feb 15 14:53:42 2013 (r246836) @@ -115,22 +115,6 @@ static uma_zone_t vm_radix_node_zone; static u_int boot_cache_cnt; static struct vm_radix_node boot_cache[VM_RADIX_BOOT_CACHE]; -#ifdef INVARIANTS -/* - * Radix node zone destructor. - */ -static void -vm_radix_node_zone_dtor(void *mem, int size __unused, void *arg __unused) -{ - struct vm_radix_node *rnode; - - rnode = mem; - KASSERT(rnode->rn_count == 0, - ("vm_radix_node_put: Freeing node %p with %d children\n", mem, - rnode->rn_count)); -} -#endif - static struct vm_radix_node * vm_radix_carve_bootcache(void) { @@ -373,6 +357,22 @@ vm_radix_reclaim_allnodes_int(struct vm_ vm_radix_node_put(rnode); } +#ifdef INVARIANTS +/* + * Radix node zone destructor. + */ +static void +vm_radix_node_zone_dtor(void *mem, int size __unused, void *arg __unused) +{ + struct vm_radix_node *rnode; + + rnode = mem; + KASSERT(rnode->rn_count == 0, + ("vm_radix_node_put: Freeing node %p with %d children\n", mem, + rnode->rn_count)); +} +#endif + /* * Pre-allocate intermediate nodes from the UMA slab zone. */