From owner-svn-src-user@FreeBSD.ORG Fri Jan 8 22:56:47 2010
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 526D7106566B;
Fri, 8 Jan 2010 22:56:47 +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 41A798FC17;
Fri, 8 Jan 2010 22:56:47 +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 o08MulDA017214;
Fri, 8 Jan 2010 22:56:47 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o08MulNI017200;
Fri, 8 Jan 2010 22:56:47 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201001082256.o08MulNI017200@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 8 Jan 2010 22:56:47 +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: r201847 -
user/kmacy/releng_8_rump/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: Fri, 08 Jan 2010 22:56:47 -0000
Author: kmacy
Date: Fri Jan 8 22:56:46 2010
New Revision: 201847
URL: http://svn.freebsd.org/changeset/base/201847
Log:
fix ZFS build with ZIO_USE_UMA
Modified:
user/kmacy/releng_8_rump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
Modified: user/kmacy/releng_8_rump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- user/kmacy/releng_8_rump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Jan 8 22:52:02 2010 (r201846)
+++ user/kmacy/releng_8_rump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Jan 8 22:56:46 2010 (r201847)
@@ -1886,6 +1886,11 @@ arc_reclaim_needed(void)
return (0);
}
+#ifdef ZIO_USE_UMA
+ extern kmem_cache_t *zio_buf_cache[];
+ extern kmem_cache_t *zio_data_buf_cache[];
+#endif
+
static void
arc_kmem_reap_now(arc_reclaim_strategy_t strat)
{
@@ -1893,8 +1898,6 @@ arc_kmem_reap_now(arc_reclaim_strategy_t
size_t i;
kmem_cache_t *prev_cache = NULL;
kmem_cache_t *prev_data_cache = NULL;
- extern kmem_cache_t *zio_buf_cache[];
- extern kmem_cache_t *zio_data_buf_cache[];
#endif
#ifdef _KERNEL