Try to fix existing export bug masked by no-op (openzfs#291)

Signed-off-by: Paul Dagnelie <[email protected]>
ahrens · May 3, 2021 · c7ef43b · c7ef43b
1 parent 4fad2a1
commit c7ef43b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/module/zfs/spa.c b/module/zfs/spa.c
@@ -1561,7 +1561,7 @@ spa_unload(spa_t *spa)
 	 */
 	spa_async_suspend(spa);
 
-	if (spa->spa_root_vdev) {
+	if (spa->spa_root_vdev && spa->spa_final_txg == UINT64_MAX) {
 		vdev_t *root_vdev = spa->spa_root_vdev;
 		vdev_initialize_stop_all(root_vdev, VDEV_INITIALIZE_ACTIVE);
 		vdev_trim_stop_all(root_vdev, VDEV_TRIM_ACTIVE);

diff --git a/module/zfs/vdev_label.c b/module/zfs/vdev_label.c
@@ -1924,7 +1924,7 @@ vdev_config_sync(vdev_t **svd, int svdcount, uint64_t txg)
 	if (txg > spa_freeze_txg(spa))
 		return (0);
 
-	ASSERT(txg <= spa->spa_final_txg);
+	ASSERT3U(txg, <=, spa->spa_final_txg);
 
 #ifdef _KERNEL
 	if (spa->spa_root_vdev->vdev_child[0]->vdev_ops ==