From f4f86fabf3d181ee90dc57be22aec7ff67633ef7 Mon Sep 17 00:00:00 2001 From: pjd Date: Fri, 18 Jun 2010 22:06:49 +0000 Subject: [PATCH] MFC r209265: r209260: Backout r207970 for now, it can lead to deadlocks. Reported by: kan r209261: Turn off UMA allocations on all archs by default. It isn't stable even on amd64. Reported by: many Approved by: re (kib) git-svn-id: svn://svn.freebsd.org/base/releng/8.1@209319 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- .../contrib/opensolaris/uts/common/fs/zfs/zio.c | 6 +----- sys/kern/vfs_subr.c | 13 ------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c index c839eac5..6babb7d2 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c @@ -33,13 +33,9 @@ #include #include -#if defined(__amd64__) -static int zio_use_uma = 1; -#else -static int zio_use_uma = 0; -#endif SYSCTL_DECL(_vfs_zfs); SYSCTL_NODE(_vfs_zfs, OID_AUTO, zio, CTLFLAG_RW, 0, "ZFS ZIO"); +static int zio_use_uma = 0; TUNABLE_INT("vfs.zfs.zio.use_uma", &zio_use_uma); SYSCTL_INT(_vfs_zfs_zio, OID_AUTO, use_uma, CTLFLAG_RDTUN, &zio_use_uma, 0, "Use uma(9) for ZIO allocations"); diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 18d75dd2..a883dd37 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -822,19 +822,6 @@ static struct kproc_desc vnlru_kp = { SYSINIT(vnlru, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, &vnlru_kp); -static void -vfs_lowmem(void *arg __unused) -{ - - /* - * On low memory condition free 1/8th of the free vnodes. - */ - mtx_lock(&vnode_free_list_mtx); - vnlru_free(freevnodes / 8); - mtx_unlock(&vnode_free_list_mtx); -} -EVENTHANDLER_DEFINE(vm_lowmem, vfs_lowmem, NULL, 0); - /* * Routines having to do with the management of the vnode table. */ -- 2.45.0