svn commit: r281104 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Alexander Motin
mav at FreeBSD.org
Sun Apr 5 06:53:31 UTC 2015
Author: mav
Date: Sun Apr 5 06:53:29 2015
New Revision: 281104
URL: https://svnweb.freebsd.org/changeset/base/281104
Log:
MFC r280822: Some cosmetic polishing. No functional change.
Modified:
stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun Apr 5 05:18:14 2015 (r281103)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun Apr 5 06:53:29 2015 (r281104)
@@ -4152,10 +4152,10 @@ arc_init(void)
#endif
#endif /* sun */
/* 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);
@@ -4165,9 +4165,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-stable-10
mailing list