Author: avg
Date: Sat Aug 21 18:20:56 2010
New Revision: 211581
URL: http://svn.freebsd.org/changeset/base/211581

Log:
  MFC r210427: zfs arc_memory_throttle: available memory is free + cache

Modified:
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cam/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c       Sat Aug 
21 17:53:16 2010        (r211580)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c       Sat Aug 
21 18:20:56 2010        (r211581)
@@ -3612,6 +3612,8 @@ arc_memory_throttle(uint64_t reserve, ui
 #ifdef _KERNEL
        uint64_t inflight_data = arc_anon->arcs_size;
        uint64_t available_memory = ptoa((uintmax_t)cnt.v_free_count);
+       uint64_t available_memory = ptoa((uintmax_t)cnt.v_free_count
+           + cnt.v_cache_count);
        static uint64_t page_load = 0;
        static uint64_t last_txg = 0;
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to