From owner-svn-src-user@FreeBSD.ORG Sun Nov 15 23:53:10 2009 Return-Path: <owner-svn-src-user@FreeBSD.ORG> 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 4208A106566B; Sun, 15 Nov 2009 23:53:10 +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 30FCC8FC0C; Sun, 15 Nov 2009 23:53:10 +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 nAFNrA4x051629; Sun, 15 Nov 2009 23:53:10 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAFNrA8U051627; Sun, 15 Nov 2009 23:53:10 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200911152353.nAFNrA8U051627@svn.freebsd.org> From: Kip Macy <kmacy@FreeBSD.org> Date: Sun, 15 Nov 2009 23:53:10 +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: r199303 - 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" <svn-src-user.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user> List-Post: <mailto:svn-src-user@freebsd.org> List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>, <mailto:svn-src-user-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 15 Nov 2009 23:53:10 -0000 Author: kmacy Date: Sun Nov 15 23:53:09 2009 New Revision: 199303 URL: http://svn.freebsd.org/changeset/base/199303 Log: make tunable for disabling freeing of buffers to the page cache 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 Sun Nov 15 23:51:59 2009 (r199302) +++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Sun Nov 15 23:53:09 2009 (r199303) @@ -187,7 +187,9 @@ SYSCTL_QUAD(_vfs_zfs, OID_AUTO, arc_min, SYSCTL_INT(_vfs_zfs, OID_AUTO, mdcomp_disable, CTLFLAG_RDTUN, &zfs_mdcomp_disable, 0, "Disable metadata compression"); -static int page_cache_disable = 1; +static int zfs_page_cache_disable = 0; +SYSCTL_INT(_vfs_zfs, OID_AUTO, page_cache_disable, CTLFLAG_RDTUN, + &zfs_page_cache_disable, 0, "Disable backing ARC with page cache "); #ifdef ZIO_USE_UMA extern kmem_cache_t *zio_buf_cache[]; @@ -1389,7 +1391,7 @@ arc_getblk(arc_buf_t *buf) data = zio_buf_alloc(size); } else if ((buf->b_hdr->b_flags & ARC_BUF_CLONING) || BUF_EMPTY(buf->b_hdr) || - page_cache_disable) { + zfs_page_cache_disable) { newbp = geteblk(size, flags); data = newbp->b_data; } else { @@ -1402,7 +1404,7 @@ arc_getblk(arc_buf_t *buf) if ((buf->b_hdr->b_flags & ARC_BUF_CLONING) && (size >= PAGE_SIZE) && (!BUF_EMPTY(buf->b_hdr)) && - !page_cache_disable) + !zfs_page_cache_disable) arc_binval(buf, blkno, vp, size, flags, newbp); buf->b_hdr->b_flags &= ~ARC_BUF_CLONING; @@ -3474,7 +3476,7 @@ arc_write_done(zio_t *zio) (bp != NULL) && (bp->b_bufobj == NULL) && (bp->b_bcount >= PAGE_SIZE) && - !page_cache_disable) { + !zfs_page_cache_disable) { arc_binval(buf, blkno, vp, bp->b_bcount, 0, bp); }