svn commit: r280822 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Steven Hartland steven at multiplay.co.uk
Sun Mar 29 21:44:34 UTC 2015


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
>   
>



More information about the svn-src-head mailing list