From owner-svn-src-all@FreeBSD.ORG Sun Mar 29 21:52:16 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03D67571; Sun, 29 Mar 2015 21:52:16 +0000 (UTC) Received: from mail-wg0-x230.google.com (mail-wg0-x230.google.com [IPv6:2a00:1450:400c:c00::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9E163F0C; Sun, 29 Mar 2015 21:52:15 +0000 (UTC) Received: by wgdm6 with SMTP id m6so151396501wgd.2; Sun, 29 Mar 2015 14:52:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=GyjpkFqNN0hi/q9qDy95UPEUA5+ajCveIXYlA8HKrD0=; b=OESCiaKSLdjxf2j5h1in5UAeQNh0Gy/EZra9eqMp9diQDEqgGfWdmPVBeWQuvHWcq2 sBnoHqhPtdBMWsovmyG31o/HHtk+yuB5/vX4Pft2vDefKTa8ibNcyeqaP8lBIwR9YnIG KKjrgbQO6hQkdL1v+O0BGdlt6Rm6DEBL9AqgVuL6iSEgxytHI+v3JY+LG295lpA6cxXs pZOyS6t8IzP+1iOlfO/ib2JR5zbSKuD1xwBzBqpmPut88vLw8EmZz0Ed2LPSFuLsuMWd hyC5Z1PZ3ohLC1x/Tp/L4+RMYqTkw0wwHggBSbHxFFoJ9FuYnU+AipDhkdDcKymL54it ZhCA== X-Received: by 10.194.75.193 with SMTP id e1mr55587176wjw.126.1427665933949; Sun, 29 Mar 2015 14:52:13 -0700 (PDT) Received: from mavbook.mavhome.dp.ua ([134.249.139.101]) by mx.google.com with ESMTPSA id q10sm12860401wjr.41.2015.03.29.14.52.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Mar 2015 14:52:12 -0700 (PDT) Sender: Alexander Motin Message-ID: <5518740A.1050806@FreeBSD.org> Date: Mon, 30 Mar 2015 00:52:10 +0300 From: Alexander Motin User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Steven Hartland , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r280822 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs References: <201503292028.t2TKSJ9E016958@svn.freebsd.org> <55187240.4050007@freebsd.org> In-Reply-To: <55187240.4050007@freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Mar 2015 21:52:16 -0000 On 30.03.2015 00:44, Steven Hartland wrote: > Given the upstream nature of this code it may be better to not do > cosmetic changes like unless they are first upstreamed as it makes > comparing with the upstream when bringing update harder. My changes didn't move the code away from the upstream, may be even made it a bit closer. In places where upstream code has "64 << 20", I changed our code from "64<<18" to "16 << 20", which I believe both more correct and closer to upstream. > On 29/03/2015 21:28, Alexander Motin wrote: >> Author: mav >> Date: Sun Mar 29 20:28:18 2015 >> New Revision: 280822 >> URL: https://svnweb.freebsd.org/changeset/base/280822 >> >> Log: >> Some cosmetic polishing. No functional change. >> MFC after: 1 week >> >> Modified: >> head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c >> >> Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c >> ============================================================================== >> >> --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun >> Mar 29 20:21:59 2015 (r280821) >> +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun >> Mar 29 20:28:18 2015 (r280822) >> @@ -4194,10 +4194,10 @@ arc_init(void) >> #endif >> #endif /* illumos */ >> /* set min cache to 1/32 of all memory, or 16MB, whichever is >> more */ >> - arc_c_min = MAX(arc_c / 4, 64<<18); >> + arc_c_min = MAX(arc_c / 4, 16 << 20); >> /* set max to 1/2 of all memory, or all but 1GB, whichever is >> more */ >> - if (arc_c * 8 >= 1<<30) >> - arc_c_max = (arc_c * 8) - (1<<30); >> + if (arc_c * 8 >= 1 << 30) >> + arc_c_max = (arc_c * 8) - (1 << 30); >> else >> arc_c_max = arc_c_min; >> arc_c_max = MAX(arc_c * 5, arc_c_max); >> @@ -4207,9 +4207,9 @@ arc_init(void) >> * Allow the tunables to override our calculations if they are >> * reasonable (ie. over 16MB) >> */ >> - if (zfs_arc_max > 64<<18 && zfs_arc_max < kmem_size()) >> + if (zfs_arc_max > 16 << 20 && zfs_arc_max < kmem_size()) >> arc_c_max = zfs_arc_max; >> - if (zfs_arc_min > 64<<18 && zfs_arc_min <= arc_c_max) >> + if (zfs_arc_min > 16 << 20 && zfs_arc_min <= arc_c_max) >> arc_c_min = zfs_arc_min; >> #endif >> > -- Alexander Motin