From owner-svn-src-head@FreeBSD.ORG Fri Feb 1 14:21:10 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4CD12589; Fri, 1 Feb 2013 14:21:10 +0000 (UTC) (envelope-from andre@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 26F98981; Fri, 1 Feb 2013 14:21:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11ELASF040395; Fri, 1 Feb 2013 14:21:10 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11EL9ek040392; Fri, 1 Feb 2013 14:21:09 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201302011421.r11EL9ek040392@svn.freebsd.org> From: Andre Oppermann Date: Fri, 1 Feb 2013 14:21:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r246208 - head/sys/netinet X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 14:21:10 -0000 Author: andre Date: Fri Feb 1 14:21:09 2013 New Revision: 246208 URL: http://svnweb.freebsd.org/changeset/base/246208 Log: uma_zone_set_max() directly returns the rounded effective zone limit. Use the return value directly instead of doing a second uma_zone_set_max() step. MFC after: 1 week Modified: head/sys/netinet/tcp_reass.c head/sys/netinet/tcp_syncache.c Modified: head/sys/netinet/tcp_reass.c ============================================================================== --- head/sys/netinet/tcp_reass.c Fri Feb 1 14:16:37 2013 (r246207) +++ head/sys/netinet/tcp_reass.c Fri Feb 1 14:21:09 2013 (r246208) @@ -106,8 +106,8 @@ tcp_reass_zone_change(void *tag) /* Set the zone limit and read back the effective value. */ V_tcp_reass_maxseg = nmbclusters / 16; - uma_zone_set_max(V_tcp_reass_zone, V_tcp_reass_maxseg); - V_tcp_reass_maxseg = uma_zone_get_max(V_tcp_reass_zone); + V_tcp_reass_maxseg = uma_zone_set_max(V_tcp_reass_zone, + V_tcp_reass_maxseg); } void @@ -120,8 +120,8 @@ tcp_reass_init(void) V_tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); /* Set the zone limit and read back the effective value. */ - uma_zone_set_max(V_tcp_reass_zone, V_tcp_reass_maxseg); - V_tcp_reass_maxseg = uma_zone_get_max(V_tcp_reass_zone); + V_tcp_reass_maxseg = uma_zone_set_max(V_tcp_reass_zone, + V_tcp_reass_maxseg); EVENTHANDLER_REGISTER(nmbclusters_change, tcp_reass_zone_change, NULL, EVENTHANDLER_PRI_ANY); } Modified: head/sys/netinet/tcp_syncache.c ============================================================================== --- head/sys/netinet/tcp_syncache.c Fri Feb 1 14:16:37 2013 (r246207) +++ head/sys/netinet/tcp_syncache.c Fri Feb 1 14:21:09 2013 (r246208) @@ -268,8 +268,8 @@ syncache_init(void) /* Create the syncache entry zone. */ V_tcp_syncache.zone = uma_zcreate("syncache", sizeof(struct syncache), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); - uma_zone_set_max(V_tcp_syncache.zone, V_tcp_syncache.cache_limit); - V_tcp_syncache.cache_limit = uma_zone_get_max(V_tcp_syncache.zone); + V_tcp_syncache.cache_limit = uma_zone_set_max(V_tcp_syncache.zone, + V_tcp_syncache.cache_limit); } #ifdef VIMAGE