diff options
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/dbuf.c | 8 | ||||
| -rw-r--r-- | module/zfs/spa.c | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c index 4f1750650..c70306c9a 100644 --- a/module/zfs/dbuf.c +++ b/module/zfs/dbuf.c @@ -1391,14 +1391,6 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_t *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); diff --git a/module/zfs/spa.c b/module/zfs/spa.c index 6a5d48aab..0d0499c63 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -3901,8 +3901,6 @@ spa_import(char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags) spa_config_sync(spa, B_FALSE, B_TRUE); mutex_exit(&spa_namespace_lock); - spa_history_log_version(spa, "import"); - return (0); } |