svn commit: r194280 - in user/kmacy/releng_7_2_fcs/sys: cddl/contrib/opensolaris/uts/common/fs/zfs conf

[Kip Macy]

Author: kmacy
Date: Tue Jun 16 03:51:38 2009
New Revision: 194280
URL: http://svn.freebsd.org/changeset/base/194280

Log:
  enable UMA use for allocation

Modified:
  user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/kmacy/releng_7_2_fcs/sys/conf/kern.pre.mk

Modified: user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Tue Jun 16 03:49:59 2009	(r194279)
+++ user/kmacy/releng_7_2_fcs/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Tue Jun 16 03:51:38 2009	(r194280)
@@ -91,13 +91,6 @@ zio_init(void)
 #ifdef ZIO_USE_UMA
 	size_t c;
 #endif
-#if 0
-	vmem_t *data_alloc_arena = NULL;
-
-#ifdef _KERNEL
-	data_alloc_arena = zio_alloc_arena;
-#endif
-#endif
 	zio_cache = kmem_cache_create("zio_cache", sizeof (zio_t), 0,
 	    NULL, NULL, NULL, NULL, NULL, 0);
 
@@ -135,7 +128,7 @@ zio_init(void)
 
 			(void) sprintf(name, "zio_data_buf_%lu", (ulong_t)size);
 			zio_data_buf_cache[c] = kmem_cache_create(name, size,
-			    align, NULL, NULL, NULL, NULL, data_alloc_arena,
+			    align, NULL, NULL, NULL, NULL, NULL,
 			    KMC_NODEBUG);
 		}
 	}

Modified: user/kmacy/releng_7_2_fcs/sys/conf/kern.pre.mk
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/conf/kern.pre.mk	Tue Jun 16 03:49:59 2009	(r194279)
+++ user/kmacy/releng_7_2_fcs/sys/conf/kern.pre.mk	Tue Jun 16 03:51:38 2009	(r194280)
@@ -123,7 +123,7 @@ INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/
 CFLAGS=	${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS}
 CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
 
-ZFS_CFLAGS= -DFREEBSD_NAMECACHE -DBUILDING_ZFS -D_KERNEL
+ZFS_CFLAGS= -DFREEBSD_NAMECACHE -DBUILDING_ZFS -D_KERNEL -DZIO_USE_UMA
 ZFS_CFLAGS+=-DHAVE_KERNEL_OPTION_HEADERS -nostdinc 	
 ZFS_CFLAGS+=-mcmodel=kernel -mno-red-zone  -mfpmath=387 -mno-sse -mno-sse2 -mno-sse3 -mno-mmx -mno-3dnow  -msoft-float -fno-asynchronous-unwind-tables -ffreestanding
 ZFS_CFLAGS+=${COPTFLAGS} ${ZFS_C_DIALECT} ${DEBUG} ${CWARNFLAGS}