Revert "Do not hold spa_config in ZIL while blocked on IO"
This reverts commit 7d638df09b
.
Reviewed-by: Prakash Surya <prakash.surya@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: George Wilson <gwilson@delphix.com>
Closes #14678
This commit is contained in:
parent
aebd94cc85
commit
a604d3243b
@ -1384,6 +1384,8 @@ zil_lwb_flush_vdevs_done(zio_t *zio)
|
||||
itx_t *itx;
|
||||
uint64_t txg;
|
||||
|
||||
spa_config_exit(zilog->zl_spa, SCL_STATE, lwb);
|
||||
|
||||
zio_buf_free(lwb->lwb_buf, lwb->lwb_sz);
|
||||
|
||||
mutex_enter(&zilog->zl_lock);
|
||||
@ -1522,6 +1524,8 @@ zil_lwb_write_done(zio_t *zio)
|
||||
zil_vdev_node_t *zv;
|
||||
lwb_t *nlwb;
|
||||
|
||||
ASSERT3S(spa_config_held(spa, SCL_STATE, RW_READER), !=, 0);
|
||||
|
||||
ASSERT(BP_GET_COMPRESS(zio->io_bp) == ZIO_COMPRESS_OFF);
|
||||
ASSERT(BP_GET_TYPE(zio->io_bp) == DMU_OT_INTENT_LOG);
|
||||
ASSERT(BP_GET_LEVEL(zio->io_bp) == 0);
|
||||
@ -1583,7 +1587,6 @@ zil_lwb_write_done(zio_t *zio)
|
||||
return;
|
||||
}
|
||||
|
||||
spa_config_enter(spa, SCL_STATE, FTAG, RW_READER);
|
||||
while ((zv = avl_destroy_nodes(t, &cookie)) != NULL) {
|
||||
vdev_t *vd = vdev_lookup_top(spa, zv->zv_vdev);
|
||||
if (vd != NULL) {
|
||||
@ -1599,7 +1602,6 @@ zil_lwb_write_done(zio_t *zio)
|
||||
}
|
||||
kmem_free(zv, sizeof (*zv));
|
||||
}
|
||||
spa_config_exit(spa, SCL_STATE, FTAG);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -1878,6 +1880,8 @@ zil_lwb_write_issue(zilog_t *zilog, lwb_t *lwb)
|
||||
*/
|
||||
memset(lwb->lwb_buf + lwb->lwb_nused, 0, wsz - lwb->lwb_nused);
|
||||
|
||||
spa_config_enter(zilog->zl_spa, SCL_STATE, lwb, RW_READER);
|
||||
|
||||
zil_lwb_add_block(lwb, &lwb->lwb_blk);
|
||||
lwb->lwb_issued_timestamp = gethrtime();
|
||||
lwb->lwb_state = LWB_STATE_ISSUED;
|
||||
|
Loading…
Reference in New Issue
Block a user