=> openzfs#2662: turbo/illumos-5117 - spacemap reallocation can cause…

… corruption Port of Illumos openzfs#5117 (https://reviews.csiden.org/r/80/)
FransUrbo · Sep 7, 2014 · ae6fe66 · ae6fe66
1 parent c7437b4
commit ae6fe66
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/module/zfs/dnode_sync.c b/module/zfs/dnode_sync.c
@@ -695,6 +695,11 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx)
 		return;
 	}
 
+	if (dn->dn_next_nlevels[txgoff]) {
+		dnode_increase_indirection(dn, tx);
+		dn->dn_next_nlevels[txgoff] = 0;
+	}
+
 	if (dn->dn_next_nblkptr[txgoff]) {
 		/* this should only happen on a realloc */
 		ASSERT(dn->dn_allocated_txg == tx->tx_txg);
@@ -720,11 +725,6 @@ dnode_sync(dnode_t *dn, dmu_tx_t *tx)
 		mutex_exit(&dn->dn_mtx);
 	}
 
-	if (dn->dn_next_nlevels[txgoff]) {
-		dnode_increase_indirection(dn, tx);
-		dn->dn_next_nlevels[txgoff] = 0;
-	}
-
 	dbuf_sync_list(list, tx);
 
 	if (!DMU_OBJECT_IS_SPECIAL(dn->dn_object)) {