From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 18 Feb 2011 17:31:25 +0000 (-0800)
Subject: Merge branch 'zpl'
X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=commitdiff_plain;h=5d0265c0dd54d798a35babe587ad5138392fe807;hp=037849f854c511d86e3564ed7000e6c6472d6f70;p=zfs.git

Merge branch 'zpl'
---

diff --git a/include/sys/txg.h b/include/sys/txg.h
index e323d5e..2636938 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 cbd1778..0703a94 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 382a2a9..5afb139 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