svn commit: r273193 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Thu Oct 16 22:33:09 2014
New Revision: 273193
URL: https://svnweb.freebsd.org/changeset/base/273193

Log:
  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

Modified:
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Thu Oct 16 22:20:38 2014	(r273192)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Thu Oct 16 22:33:09 2014	(r273193)
@@ -2594,6 +2594,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
@@ -2631,6 +2632,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: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c	Thu Oct 16 22:20:38 2014	(r273192)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c	Thu Oct 16 22:33:09 2014	(r273193)
@@ -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)