d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ZFS ARC min / max tunable

Browse Source 
Due to ARC initial configuration not being done and kmem information
not being available we need to blindly set zfs_arc_max and zfs_arc_min
when configured via the tunable.

This fixes vfs.zfs.arc_(min|max) configuration via loader.conf broken by
r302265.

Approved by:	re(gjb)
MFC after:	1 week
This commit is contained in:
smh 2016-07-06 23:49:19 +00:00
parent fe840b6ea6
commit f10b37d27b
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
View File

@ -919,6 +919,12 @@ sysctl_vfs_zfs_arc_max(SYSCTL_HANDLER_ARGS)
if (err != 0 || req->newptr == NULL)
return (err);
if (zfs_arc_max == 0) {
/* Loader tunable so blindly set */
zfs_arc_max = val;
return (0);
}
if (val < arc_abs_min || val > kmem_size())
return (EINVAL);
if (val < arc_c_min)
@ -956,6 +962,12 @@ sysctl_vfs_zfs_arc_min(SYSCTL_HANDLER_ARGS)
if (err != 0 || req->newptr == NULL)
return (err);
if (zfs_arc_min == 0) {
/* Loader tunable so blindly set */
zfs_arc_min = val;
return (0);
}
if (val < arc_abs_min || val > arc_c_max)
return (EINVAL);