Issue openzfs#4116. Move dmu_tx_get_txg after dmu_tx_assign.

ab-oe · Feb 28, 2016 · ea7aa5b · ea7aa5b
1 parent 39a41a7
commit ea7aa5b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c
@@ -281,14 +281,14 @@ zvol_update_volsize(uint64_t volsize, objset_t *os)
 	ASSERT(MUTEX_HELD(&zvol_state_lock));
 
 	tx = dmu_tx_create(os);
-	txg = dmu_tx_get_txg(tx);
 	dmu_tx_hold_zap(tx, ZVOL_ZAP_OBJ, TRUE, NULL);
 	dmu_tx_mark_netfree(tx);
 	error = dmu_tx_assign(tx, TXG_WAIT);
 	if (error) {
 		dmu_tx_abort(tx);
 		return (SET_ERROR(error));
 	}
+	txg = dmu_tx_get_txg(tx);
 
 	error = zap_update(os, ZVOL_ZAP_OBJ, "size", 8, 1,
 	    &volsize, tx);