svn commit: r201648 - stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Leidinger]

Author: netchild
Date: Wed Jan  6 14:14:59 2010
New Revision: 201648
URL: http://svn.freebsd.org/changeset/base/201648

Log:
  - Remove doublet creation of the zio_cache which was introduced in the
    zpool v13 commit.
  - Diff reduction to 8-stable (add an empty line).

Modified:
  stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c

Modified: stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
==============================================================================
--- stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Wed Jan  6 14:01:28 2010	(r201647)
+++ stable/7/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c	Wed Jan  6 14:14:59 2010	(r201648)
@@ -101,9 +101,6 @@ zio_init(void)
 	zio_cache = kmem_cache_create("zio_cache", sizeof (zio_t), 0,
 	    NULL, NULL, NULL, NULL, NULL, 0);
 
-	zio_cache = kmem_cache_create("zio_cache", sizeof (zio_t), 0,
-	    NULL, NULL, NULL, NULL, NULL, 0);
-
 #ifdef ZIO_USE_UMA
 	/*
 	 * For small buffers, we want a cache for each multiple of
@@ -425,6 +422,7 @@ 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);