svn commit: r246388 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/lib/libzfs/common

[Martin Matuska]

Author: mm
Date: Wed Feb  6 07:54:46 2013
New Revision: 246388
URL: http://svnweb.freebsd.org/changeset/base/246388

Log:
  Update vendor/illumos/dist and vendor-sys/illumos/dist
  to illumos-gate 13934:9e23a7f7b812
  
  Illumos ZFS issues:
   3422 zpool create/syseventd race yield non-importable pool
   3425 first write to a new zvol can fail with EFBIG

Modified:
  vendor/illumos/dist/lib/libzfs/common/libzfs_import.c

Changes in other areas also in this revision:
Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dmu_tx.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/vdev.c

Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_import.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_import.c	Wed Feb  6 07:27:25 2013	(r246387)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_import.c	Wed Feb  6 07:54:46 2013	(r246388)
@@ -528,13 +528,12 @@ get_configs(libzfs_handle_t *hdl, pool_l
 				 *	version
 				 *	pool guid
 				 *	name
-				 *	pool txg (if available)
 				 *	comment (if available)
 				 *	pool state
 				 *	hostid (if available)
 				 *	hostname (if available)
 				 */
-				uint64_t state, version, pool_txg;
+				uint64_t state, version;
 				char *comment = NULL;
 
 				version = fnvlist_lookup_uint64(tmp,
@@ -550,11 +549,6 @@ get_configs(libzfs_handle_t *hdl, pool_l
 				fnvlist_add_string(config,
 				    ZPOOL_CONFIG_POOL_NAME, name);
 
-				if (nvlist_lookup_uint64(tmp,
-				    ZPOOL_CONFIG_POOL_TXG, &pool_txg) == 0)
-					fnvlist_add_uint64(config,
-					    ZPOOL_CONFIG_POOL_TXG, pool_txg);
-
 				if (nvlist_lookup_string(tmp,
 				    ZPOOL_CONFIG_COMMENT, &comment) == 0)
 					fnvlist_add_string(config,