diff options
| author | delphij <delphij@FreeBSD.org> | 2014-01-14 01:28:08 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2014-01-14 01:28:08 +0000 |
| commit | 139f0a076d739c260e4270431bd22aed92fc0e6b (patch) | |
| tree | e4f34e366c63a9beffbbd8db53b68bfbb13776d9 /sys/cddl | |
| parent | f8756761ddd0980bf1ac6997bb07bb8f95f3ffcd (diff) | |
| download | FreeBSD-src-139f0a076d739c260e4270431bd22aed92fc0e6b.zip FreeBSD-src-139f0a076d739c260e4270431bd22aed92fc0e6b.tar.gz | |
MFC r259811:
MFV r258373:
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
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c | 8 | ||||
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c index 4d02a1d..f22dddb 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c @@ -1329,14 +1329,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/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c index cfeb21c..31bc32d 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c @@ -4021,8 +4021,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); } |
