From owner-svn-src-user@FreeBSD.ORG Tue Nov 3 07:19:56 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE8AE106566C; Tue, 3 Nov 2009 07:19:56 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9DE938FC1B; Tue, 3 Nov 2009 07:19:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nA37JuVU083035; Tue, 3 Nov 2009 07:19:56 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nA37JuRm083033; Tue, 3 Nov 2009 07:19:56 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200911030719.nA37JuRm083033@svn.freebsd.org> From: Kip Macy Date: Tue, 3 Nov 2009 07:19:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r198843 - user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2009 07:19:56 -0000 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); }