diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-09-18 05:44:18 -0600 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-09-18 08:12:21 -0600 |
| commit | 262af05a990afe4ad4e40b9e3ec56bfe56b80db5 (patch) | |
| tree | d0f874b2e82c0b761c227377ea1db7a1a78dabc5 | |
| parent | e6615f1000c4c6e6b8e18bdc6b077002bdd22526 (diff) | |
| download | illumos-joyent-262af05a990afe4ad4e40b9e3ec56bfe56b80db5.tar.gz | |
11705 adding a swap zvol on a DEBUG build blows assert after 11650
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zvol.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/uts/common/fs/zfs/zvol.c b/usr/src/uts/common/fs/zfs/zvol.c index 276cf84e0c..45499c205e 100644 --- a/usr/src/uts/common/fs/zfs/zvol.c +++ b/usr/src/uts/common/fs/zfs/zvol.c @@ -643,13 +643,13 @@ zvol_first_open(zvol_state_t *zv, boolean_t rdonly) error = zap_lookup(os, ZVOL_ZAP_OBJ, "size", 8, 1, &volsize); if (error) { ASSERT(error == 0); - dmu_objset_disown(os, 1, zvol_tag); + dmu_objset_disown(os, 1, zv); return (error); } error = dnode_hold(os, ZVOL_OBJ, zvol_tag, &zv->zv_dn); if (error) { - dmu_objset_disown(os, 1, zvol_tag); + dmu_objset_disown(os, 1, zv); return (error); } @@ -683,7 +683,7 @@ zvol_last_close(zvol_state_t *zv) txg_wait_synced(dmu_objset_pool(zv->zv_objset), 0); dmu_objset_evict_dbufs(zv->zv_objset); - dmu_objset_disown(zv->zv_objset, 1, zvol_tag); + dmu_objset_disown(zv->zv_objset, 1, zv); zv->zv_objset = NULL; } |