From owner-svn-src-all@FreeBSD.ORG Sun Mar 29 21:44:34 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 DA598D83 for ; Sun, 29 Mar 2015 21:44:33 +0000 (UTC) Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) (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 7CAFAE1B for ; Sun, 29 Mar 2015 21:44:33 +0000 (UTC) Received: by wgdm6 with SMTP id m6so151299406wgd.2 for ; Sun, 29 Mar 2015 14:44:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:message-id:date:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=+tdtkyqWCU1BoZrITPO2MqD6joq1J6++XYnh7+/Cgc4=; b=f/j+HPWrDcY7RbVGM4foMpQAoWC2P2Zj+xMKmenaOvxTo4N6sw5NyiEg5e2lluTnzA Oc9Z4bVlArp30VpU8zg0IEyhlqIuF096cp5GlTD1Yi3pgf+4X2WwK8v1TbsuY3Pon2yO iuKxAkcozUNS11+NO3UtM1cj1tylaYAkAN19L+2GUYFl5gpnT3vzOc6hKDIB0v1t2LUH T5CXMDpz3qi81DUAvN2D4AkjtVN8to6bFF2KhZCXAE7zQthFZfUAgYSasRq72WZu9cQv h+9AVVMxveNymclN4u2IFAVExQSo8Zbq4Ff/Cd0YGab+td8EErFDEbBqGt1wJmV/cEqB VUbQ== X-Gm-Message-State: ALoCoQkn2qUzG4lcIRlQlmn7o1xQjtz9ko+BBUfoKNZpyjYB8MfbGR/ZzX3bgpyz8Znc/Qmv9P5j X-Received: by 10.194.47.201 with SMTP id f9mr55734740wjn.17.1427665465692; Sun, 29 Mar 2015 14:44:25 -0700 (PDT) Received: from [10.10.1.68] (82-69-141-170.dsl.in-addr.zen.co.uk. [82.69.141.170]) by mx.google.com with ESMTPSA id pm6sm13434891wic.20.2015.03.29.14.44.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 Mar 2015 14:44:24 -0700 (PDT) From: Steven Hartland X-Google-Original-From: Steven Hartland Message-ID: <55187240.4050007@freebsd.org> Date: Sun, 29 Mar 2015 22:44:32 +0100 User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Alexander Motin , 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> In-Reply-To: <201503292028.t2TKSJ9E016958@svn.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed 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:44:34 -0000 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. 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 > >