svn commit: r258373 - vendor-sys/illumos/dist/uts/common/fs/zfs vendor/illumos/dist/cmd/zhack

[Andriy Gapon]

Author: avg
Date: Wed Nov 20 10:52:48 2013
New Revision: 258373
URL: http://svnweb.freebsd.org/changeset/base/258373

Log:
  4168 ztest assertion failure in dbuf_undirty
  
  4169 verbatim import causes zdb to segfa
  4170 zhack leaves pool in ACTIVE state
  
  illumos/illumos-gate at 7fdd916c474ea52896c671bbe7b56ba34a1ca132

Modified:
  vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c
  vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c

Changes in other areas also in this revision:
Modified:
  vendor/illumos/dist/cmd/zhack/zhack.c

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c	Wed Nov 20 10:50:54 2013	(r258372)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/dbuf.c	Wed Nov 20 10:52:48 2013	(r258373)
@@ -1334,14 +1334,6 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_
 	DB_DNODE_ENTER(db);
 	dn = DB_DNODE(db);
 
-	/*
-	 * Note:  This code will probably work even if there are concurrent
-	 * holders, but it is untested in that scenerio, as the ZPL and
-	 * ztest have additional locking (the range locks) that prevents
-	 * that type of concurrent access.
-	 */
-	ASSERT3U(refcount_count(&db->db_holds), ==, db->db_dirtycnt);
-
 	dprintf_dbuf(db, "size=%llx\n", (u_longlong_t)db->db.db_size);
 
 	ASSERT(db->db.db_size != 0);

Modified: vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c
==============================================================================
--- vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c	Wed Nov 20 10:50:54 2013	(r258372)
+++ vendor-sys/illumos/dist/uts/common/fs/zfs/spa.c	Wed Nov 20 10:52:48 2013	(r258373)
@@ -3842,8 +3842,6 @@ spa_import(const char *pool, nvlist_t *c
 		spa_config_sync(spa, B_FALSE, B_TRUE);
 
 		mutex_exit(&spa_namespace_lock);
-		spa_history_log_version(spa, "import");
-
 		return (0);
 	}