svn commit: r211599 -
stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
Andriy Gapon
avg at FreeBSD.org
Sun Aug 22 08:18:32 UTC 2010
Author: avg
Date: Sun Aug 22 08:18:32 2010
New Revision: 211599
URL: http://svn.freebsd.org/changeset/base/211599
Log:
Fix a mismerge in r211581, MFC of r210427
This is a direct commit.
Reported by: many
Pointyhat to: avg
Modified:
stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
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 Sun Aug 22 05:36:06 2010 (r211598)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun Aug 22 08:18:32 2010 (r211599)
@@ -3611,7 +3611,6 @@ 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;
More information about the svn-src-stable-8
mailing list