svn commit: r209319 - in releng/8.1/sys:
cddl/contrib/opensolaris/uts/common/fs/zfs kern
Pawel Jakub Dawidek
pjd at FreeBSD.org
Fri Jun 18 22:06:50 UTC 2010
Author: pjd
Date: Fri Jun 18 22:06:49 2010
New Revision: 209319
URL: http://svn.freebsd.org/changeset/base/209319
Log:
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)
Modified:
releng/8.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
releng/8.1/sys/kern/vfs_subr.c
Directory Properties:
releng/8.1/sys/ (props changed)
releng/8.1/sys/amd64/include/xen/ (props changed)
releng/8.1/sys/cddl/contrib/opensolaris/ (props changed)
releng/8.1/sys/contrib/dev/acpica/ (props changed)
releng/8.1/sys/contrib/pf/ (props changed)
releng/8.1/sys/dev/xen/xenpci/ (props changed)
releng/8.1/sys/geom/sched/ (props changed)
Modified: releng/8.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- releng/8.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Fri Jun 18 21:40:32 2010 (r209318)
+++ releng/8.1/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Fri Jun 18 22:06:49 2010 (r209319)
@@ -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");
Modified: releng/8.1/sys/kern/vfs_subr.c
==============================================================================
--- releng/8.1/sys/kern/vfs_subr.c Fri Jun 18 21:40:32 2010 (r209318)
+++ releng/8.1/sys/kern/vfs_subr.c Fri Jun 18 22:06:49 2010 (r209319)
@@ -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.
*/
More information about the svn-src-all
mailing list