Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:openzfsonosx/zfs

  • Loading branch information...
lundman committed Nov 28, 2014
2 parents 8ab6103 + b7ceec9 commit 91b0052b9167c5447ee8c29d90126af3b621acf7
Showing with 4 additions and 10 deletions.
  1. +3 −9 module/zfs/arc.c
  2. +1 −1 module/zfs/zfs_vfsops.c
@@ -3922,15 +3922,9 @@ arc_init(void)

/* set min cache to 1/32 of all memory, or 64MB, whichever is more */
arc_c_min = MAX(arc_c / 4, 64<<20);
/* set max to 5/8 of all memory, or all but 2GB, whichever is more */

/*
* BGH - Illumos figure is 3/4 & 1GB, my mac does not like that much,
* 5/8 & 3GB feels better
*/

if (arc_c * 4 >= 1<<30) {
arc_c_max = (arc_c * 8) - ((uint64_t)(1<<30) * 3);
/* set max to 1/4 of all memory, or all but 3GB, whichever is more */
if (arc_c * 8 >= (3ULL << 30)) {
arc_c_max = (arc_c * 8) - (3ULL << 30);
} else
arc_c_max = arc_c_min;
arc_c_max = MAX(arc_c * 2, arc_c_max);
@@ -109,7 +109,7 @@

unsigned int zfs_vfs_suspend_fs_begin_delay = 2;
unsigned int zfs_vfs_suspend_fs_end_delay = 2;
unsigned int zfs_vnop_skip_unlinked_drain = 1;
unsigned int zfs_vnop_skip_unlinked_drain = 0;

int zfs_module_start(kmod_info_t *ki, void *data);
int zfs_module_stop(kmod_info_t *ki, void *data);

0 comments on commit 91b0052

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.