diff options
| author | avg <avg@FreeBSD.org> | 2013-11-20 10:52:48 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2013-11-20 10:52:48 +0000 |
| commit | 459b705536a73551c8f3ca9c62aaaccb4421077f (patch) | |
| tree | 144c0a6dab1a9dc5e4338a5d1d61101b8bf3ba1f | |
| parent | 4c547654f732c1897faed0c86c443ca39296bb98 (diff) | |
| download | FreeBSD-src-459b705536a73551c8f3ca9c62aaaccb4421077f.zip FreeBSD-src-459b705536a73551c8f3ca9c62aaaccb4421077f.tar.gz | |
4168 ztest assertion failure in dbuf_undirty
4169 verbatim import causes zdb to segfa
4170 zhack leaves pool in ACTIVE state
illumos/illumos-gate@7fdd916c474ea52896c671bbe7b56ba34a1ca132
| -rw-r--r-- | uts/common/fs/zfs/dbuf.c | 8 | ||||
| -rw-r--r-- | uts/common/fs/zfs/spa.c | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/uts/common/fs/zfs/dbuf.c b/uts/common/fs/zfs/dbuf.c index 8e0804f..86498c9 100644 --- a/uts/common/fs/zfs/dbuf.c +++ b/uts/common/fs/zfs/dbuf.c @@ -1334,14 +1334,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/uts/common/fs/zfs/spa.c b/uts/common/fs/zfs/spa.c index d7f5773..c9e26ee 100644 --- a/uts/common/fs/zfs/spa.c +++ b/uts/common/fs/zfs/spa.c @@ -3842,8 +3842,6 @@ spa_import(const 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); } |
