Date: Tue, 3 Nov 2009 07:19:56 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r198843 - user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <200911030719.nA37JuRm083033@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Tue Nov 3 07:19:56 2009 New Revision: 198843 URL: http://svn.freebsd.org/changeset/base/198843 Log: avoid divide by zero by clamping to 1 Modified: user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Modified: user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue Nov 3 06:42:55 2009 (r198842) +++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue Nov 3 07:19:56 2009 (r198843) @@ -2327,7 +2327,7 @@ arc_reclaim_thread(void *dummy __unused) static void arc_adapt(int bytes, arc_state_t *state) { - int mult; + int mult, divisor; if (state == arc_l2c_only) return; @@ -2342,13 +2342,15 @@ arc_adapt(int bytes, arc_state_t *state) * target size of the MRU list. */ if (state == arc_mru_ghost) { + divisor = MAX(arc_mru_ghost->arcs_size, 1); mult = ((arc_mru_ghost->arcs_size >= arc_mfu_ghost->arcs_size) ? 1 : (arc_mfu_ghost->arcs_size/arc_mru_ghost->arcs_size)); arc_p = MIN(arc_c, arc_p + bytes * mult); } else if (state == arc_mfu_ghost) { + divisor = MAX(arc_mfu_ghost->arcs_size, 1); mult = ((arc_mfu_ghost->arcs_size >= arc_mru_ghost->arcs_size) ? - 1 : (arc_mru_ghost->arcs_size/arc_mfu_ghost->arcs_size)); + 1 : (arc_mru_ghost->arcs_size/divisor)); arc_p = MAX(0, (int64_t)arc_p - bytes * mult); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911030719.nA37JuRm083033>