Module Name: src
Committed By: martin
Date: Wed Dec 11 14:46:28 UTC 2019
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]: arc.c
Log Message:
Pull up following revision(s) (requested by sevan in ticket #540):
external/cddl/osnet/dist/uts/common/fs/zfs/arc.c: revision 1.16
We currently lack a tunable to control ZFS prefetch, so skip the warning and
FreeBSD specific instructions on settings.
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.2 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.14.2.1 src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.14.2.2
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.14.2.1 Sun Dec 8 15:54:34 2019
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c Wed Dec 11 14:46:28 2019
@@ -6218,6 +6218,7 @@ arc_init(void)
}
#ifdef _KERNEL
+#ifdef __FreeBSD__
if (TUNABLE_INT_FETCH("vfs.zfs.prefetch_disable", &zfs_prefetch_disable))
prefetch_tunable_set = 1;
@@ -6239,6 +6240,7 @@ arc_init(void)
zfs_prefetch_disable = 1;
}
#endif
+#endif
/* Warn about ZFS memory and address space requirements. */
if (((uint64_t)physmem * PAGESIZE) < (256 + 128 + 64) * (1 << 20)) {
printf("ZFS WARNING: Recommended minimum RAM size is 512MB; "
@@ -6247,9 +6249,11 @@ arc_init(void)
if (kmem_size() < 512 * (1 << 20)) {
printf("ZFS WARNING: Recommended minimum kmem_size is 512MB; "
"expect unstable behavior.\n");
+#ifdef __FreeBSD__
printf(" Consider tuning vm.kmem_size and "
"vm.kmem_size_max\n");
printf(" in /boot/loader.conf.\n");
+#endif
}
#endif
}
