Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src/external/cddl/osnet/dist/uts/common/fs/zfs Pull up follow...
details: https://anonhg.NetBSD.org/src/rev/2d07b7eda6f4
branches: netbsd-9
changeset: 843660:2d07b7eda6f4
user: martin <martin%NetBSD.org@localhost>
date: Wed Dec 11 14:46:28 2019 +0000
description:
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.
diffstat:
external/cddl/osnet/dist/uts/common/fs/zfs/arc.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diffs (31 lines):
diff -r b91a07d30bf0 -r 2d07b7eda6f4 external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c Wed Dec 11 14:13:40 2019 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c Wed Dec 11 14:46:28 2019 +0000
@@ -6218,6 +6218,7 @@
}
#ifdef _KERNEL
+#ifdef __FreeBSD__
if (TUNABLE_INT_FETCH("vfs.zfs.prefetch_disable", &zfs_prefetch_disable))
prefetch_tunable_set = 1;
@@ -6239,6 +6240,7 @@
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 @@
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
}
Home |
Main Index |
Thread Index |
Old Index