Date: Sat, 21 Aug 2010 18:26:55 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r211582 - stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201008211826.o7LIQtJV077437@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Sat Aug 21 18:26:55 2010 New Revision: 211582 URL: http://svn.freebsd.org/changeset/base/211582 Log: MFC r210427: zfs arc_memory_throttle: available memory is free + cache Modified: stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Aug 21 18:20:56 2010 (r211581) +++ stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sat Aug 21 18:26:55 2010 (r211582) @@ -3297,6 +3297,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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008211826.o7LIQtJV077437>