From 02f91ef077424da8a7f0b05dda800296327bd3a6 Mon Sep 17 00:00:00 2001 From: chs Date: Wed, 3 Aug 2022 01:53:06 +0000 Subject: [PATCH] change the ARC reclaim code to use the pagedaemon's free page target rather than having a separate target. --- external/cddl/osnet/dist/uts/common/fs/zfs/arc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c b/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c index ea1dcdb7f078..2cfd2c976db9 100644 --- a/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c +++ b/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c @@ -288,6 +288,7 @@ int arc_procfd; #define freemem uvm_availmem(false) #define minfree uvmexp.freemin #define desfree uvmexp.freetarg +#define zfs_arc_free_target desfree #define lotsfree (desfree * 2) #define availrmem desfree #define swapfs_minfree 0 @@ -387,7 +388,6 @@ int zfs_arc_grow_retry = 0; int zfs_arc_shrink_shift = 0; int zfs_arc_p_min_shift = 0; uint64_t zfs_arc_average_blocksize = 8 * 1024; /* 8KB */ -u_int zfs_arc_free_target = 0; /* Absolute min for arc min / max is 16MB. */ static uint64_t arc_abs_min = 16 << 20; @@ -395,6 +395,8 @@ static uint64_t arc_abs_min = 16 << 20; boolean_t zfs_compressed_arc_enabled = B_TRUE; #if defined(__FreeBSD__) && defined(_KERNEL) +u_int zfs_arc_free_target = 0; + static int sysctl_vfs_zfs_arc_free_target(SYSCTL_HANDLER_ARGS); static int sysctl_vfs_zfs_arc_meta_limit(SYSCTL_HANDLER_ARGS); static int sysctl_vfs_zfs_arc_max(SYSCTL_HANDLER_ARGS);