svn commit: r272506 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Xin LI
delphij at FreeBSD.org
Sat Oct 4 08:14:12 UTC 2014
Author: delphij
Date: Sat Oct 4 08:14:10 2014
New Revision: 272506
URL: https://svnweb.freebsd.org/changeset/base/272506
Log:
MFV r272495:
In arc_kmem_reap_now(), reap range_seg_cache too to reclaim memory in
response of memory pressure.
Illumos issue:
5163 arc should reap range_seg_cache
MFC after: 1 week
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
Directory Properties:
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Oct 4 08:08:56 2014 (r272505)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Oct 4 08:14:10 2014 (r272506)
@@ -2591,6 +2591,7 @@ arc_kmem_reap_now(arc_reclaim_strategy_t
size_t i;
kmem_cache_t *prev_cache = NULL;
kmem_cache_t *prev_data_cache = NULL;
+ extern kmem_cache_t *range_seg_cache;
DTRACE_PROBE(arc__kmem_reap_start);
#ifdef _KERNEL
@@ -2628,6 +2629,7 @@ arc_kmem_reap_now(arc_reclaim_strategy_t
}
kmem_cache_reap_now(buf_cache);
kmem_cache_reap_now(hdr_cache);
+ kmem_cache_reap_now(range_seg_cache);
#ifdef sun
/*
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c Sat Oct 4 08:08:56 2014 (r272505)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c Sat Oct 4 08:14:10 2014 (r272506)
@@ -33,7 +33,7 @@
#include <sys/zio.h>
#include <sys/range_tree.h>
-static kmem_cache_t *range_seg_cache;
+kmem_cache_t *range_seg_cache;
void
range_tree_init(void)
More information about the svn-src-all
mailing list