Date: Wed, 5 Aug 2009 21:58:39 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r196076 - in user/kmacy/head_zfs_merge/sys: cddl/contrib/opensolaris/uts/common/fs/zfs modules/zfs Message-ID: <200908052158.n75LwdMC059862@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Wed Aug 5 21:58:39 2009 New Revision: 196076 URL: http://svn.freebsd.org/changeset/base/196076 Log: enable UMA for buffer allocation Modified: user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c user/kmacy/head_zfs_merge/sys/modules/zfs/Makefile Modified: user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c ============================================================================== --- user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Wed Aug 5 21:34:26 2009 (r196075) +++ user/kmacy/head_zfs_merge/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c Wed Aug 5 21:58:39 2009 (r196076) @@ -91,13 +91,9 @@ zio_init(void) #ifdef ZIO_USE_UMA size_t c; #endif -#if 0 - vmem_t *data_alloc_arena = NULL; + zio_cache = kmem_cache_create("zio_cache", sizeof (zio_t), 0, + NULL, NULL, NULL, NULL, NULL, 0); -#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); @@ -132,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); } } @@ -422,7 +418,6 @@ zio_create(zio_t *pio, spa_t *spa, uint6 ASSERT3U(size, <=, SPA_MAXBLOCKSIZE); ASSERT(P2PHASE(size, SPA_MINBLOCKSIZE) == 0); ASSERT(P2PHASE(offset, SPA_MINBLOCKSIZE) == 0); - ASSERT(!vd || spa_config_held(spa, SCL_STATE_ALL, RW_READER)); ASSERT(!bp || !(flags & ZIO_FLAG_CONFIG_WRITER)); ASSERT(vd || stage == ZIO_STAGE_OPEN); Modified: user/kmacy/head_zfs_merge/sys/modules/zfs/Makefile ============================================================================== --- user/kmacy/head_zfs_merge/sys/modules/zfs/Makefile Wed Aug 5 21:34:26 2009 (r196075) +++ user/kmacy/head_zfs_merge/sys/modules/zfs/Makefile Wed Aug 5 21:58:39 2009 (r196076) @@ -63,8 +63,8 @@ ZFS_SRCS= ${ZFS_OBJS:C/.o$/.c/} SRCS+= ${ZFS_SRCS} SRCS+= vdev_geom.c -# Use UMA for ZIO allocation. This is not stable. -#CFLAGS+=-DZIO_USE_UMA +# Use UMA for ZIO allocation. +CFLAGS+=-DZIO_USE_UMA # Use FreeBSD's namecache. CFLAGS+=-DFREEBSD_NAMECACHE
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908052158.n75LwdMC059862>