svn commit: r281635 - user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Xin LI]

Author: delphij
Date: Fri Apr 17 00:38:20 2015
New Revision: 281635
URL: https://svnweb.freebsd.org/changeset/base/281635

Log:
  Fixup r281634 by adapting r281026 to the form of r280198 (MFV r280198).

Modified:
  user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

Modified: user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Fri Apr 17 00:28:35 2015	(r281634)
+++ user/delphij/zfs-arc-rebase/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Fri Apr 17 00:38:20 2015	(r281635)
@@ -3006,11 +3006,15 @@ arc_available_memory(void)
 	 * Above limits know nothing about real level of KVA fragmentation.
 	 * Start aggressive reclamation if too little sequential KVA left.
 	 */
-	if (vmem_size(heap_arena, VMEM_MAXFREE) < zfs_max_recordsize) {
+	n = vmem_size(heap_arena, VMEM_MAXFREE) - zfs_max_recordsize;
+	if (n < 0) {
 		DTRACE_PROBE2(arc__reclaim_maxfree, uint64_t,
 		    vmem_size(heap_arena, VMEM_MAXFREE),
 		    uint64_t, zfs_max_recordsize);
-		return (1);
+		if (n < lowest) {
+			lowest = n;
+			r = FMR_ZIO_ARENA;
+		}
 	}
 
 #else	/* _KERNEL */