aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Jakub Dawidek <pjd@FreeBSD.org>2010-06-18 22:06:49 +0000
committerPawel Jakub Dawidek <pjd@FreeBSD.org>2010-06-18 22:06:49 +0000
commit52e50b42b82593eabe906c8514650e8ff45110f4 (patch)
tree44961edebb30cba67828ff42c8b7fbc1346e0359
parent50a0a767afe753e3e0efebfb0d6c93d25b51b24a (diff)
downloadsrc-52e50b42b82593eabe906c8514650e8ff45110f4.tar.gz
src-52e50b42b82593eabe906c8514650e8ff45110f4.zip
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)
Notes
Notes: svn path=/releng/8.1/; revision=209319
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c6
-rw-r--r--sys/kern/vfs_subr.c13
2 files changed, 1 insertions, 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 c839eac5b1d2..6babb7d2b505 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 <sys/zio_compress.h>
#include <sys/zio_checksum.h>
-#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 18d75dd25131..a883dd378ec6 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.
*/