diff options
| -rw-r--r-- | include/sys/txg.h | 6 | ||||
| -rw-r--r-- | module/zfs/dmu_objset.c | 1 | ||||
| -rw-r--r-- | module/zfs/txg.c | 15 |
3 files changed, 22 insertions, 0 deletions
diff --git a/include/sys/txg.h b/include/sys/txg.h index e323d5efa..263693846 100644 --- a/include/sys/txg.h +++ b/include/sys/txg.h @@ -108,6 +108,12 @@ extern boolean_t txg_stalled(struct dsl_pool *dp); extern boolean_t txg_sync_waiting(struct dsl_pool *dp); /* + * Wait for pending commit callbacks of already-synced transactions to finish + * processing. + */ +extern void txg_wait_callbacks(struct dsl_pool *dp); + +/* * Per-txg object lists. */ diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c index cbd177819..0703a9466 100644 --- a/module/zfs/dmu_objset.c +++ b/module/zfs/dmu_objset.c @@ -1811,6 +1811,7 @@ EXPORT_SYMBOL(dmu_objset_destroy); EXPORT_SYMBOL(dmu_objset_snapshot); EXPORT_SYMBOL(dmu_objset_stats); EXPORT_SYMBOL(dmu_objset_fast_stat); +EXPORT_SYMBOL(dmu_objset_spa); EXPORT_SYMBOL(dmu_objset_space); EXPORT_SYMBOL(dmu_objset_fsid_guid); EXPORT_SYMBOL(dmu_objset_find); diff --git a/module/zfs/txg.c b/module/zfs/txg.c index 382a2a91c..5afb139dd 100644 --- a/module/zfs/txg.c +++ b/module/zfs/txg.c @@ -350,6 +350,20 @@ txg_dispatch_callbacks(dsl_pool_t *dp, uint64_t txg) } } +/* + * Wait for pending commit callbacks of already-synced transactions to finish + * processing. + * Calling this function from within a commit callback will deadlock. + */ +void +txg_wait_callbacks(dsl_pool_t *dp) +{ + tx_state_t *tx = &dp->dp_tx; + + if (tx->tx_commit_cb_taskq != NULL) + taskq_wait(tx->tx_commit_cb_taskq); +} + static void txg_sync_thread(dsl_pool_t *dp) { @@ -735,6 +749,7 @@ EXPORT_SYMBOL(txg_register_callbacks); EXPORT_SYMBOL(txg_delay); EXPORT_SYMBOL(txg_wait_synced); EXPORT_SYMBOL(txg_wait_open); +EXPORT_SYMBOL(txg_wait_callbacks); EXPORT_SYMBOL(txg_stalled); EXPORT_SYMBOL(txg_sync_waiting); #endif |