diff options
| author | delphij <delphij@FreeBSD.org> | 2014-10-16 22:33:09 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-10-16 22:33:09 +0000 |
| commit | 6fe321f1522f725d33cf078fb44becbe20ec7593 (patch) | |
| tree | f74665e0802b974d0759dfd5a3b90560afa5fde5 /sys/cddl | |
| parent | 9f9b89ac402e2d98eb758e222c198822f3e159e2 (diff) | |
| download | FreeBSD-src-6fe321f1522f725d33cf078fb44becbe20ec7593.zip FreeBSD-src-6fe321f1522f725d33cf078fb44becbe20ec7593.tar.gz | |
MFC r272506: 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
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c | 2 | ||||
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c index afbc6f9..968e80c 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c @@ -2594,6 +2594,7 @@ arc_kmem_reap_now(arc_reclaim_strategy_t strat) 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 @@ -2631,6 +2632,7 @@ arc_kmem_reap_now(arc_reclaim_strategy_t strat) } kmem_cache_reap_now(buf_cache); kmem_cache_reap_now(hdr_cache); + kmem_cache_reap_now(range_seg_cache); #ifdef sun /* diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c index 22175e0..6422fd1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c @@ -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) |
