Fix ASSERT in dmu_free_long_object_raw()

This small patch fixes an issue where dmu_free_long_object_raw() calls dnode_hold() after freeing the dnode a line above. Reviewed-by: Jorgen Lundman <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Tom Caputi <[email protected]> Closes openzfs#6766
wli5 · Oct 20, 2017 · a1d400b · a1d400b
1 parent 3bc1683
commit a1d400b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
@@ -932,9 +932,10 @@ dmu_free_long_object_impl(objset_t *os, uint64_t object, boolean_t raw)
 	dmu_tx_mark_netfree(tx);
 	err = dmu_tx_assign(tx, TXG_WAIT);
 	if (err == 0) {
-		err = dmu_object_free(os, object, tx);
-		if (err == 0 && raw)
-			VERIFY0(dmu_object_dirty_raw(os, object, tx));
+		if (raw)
+			err = dmu_object_dirty_raw(os, object, tx);
+		if (err == 0)
+			err = dmu_object_free(os, object, tx);
 
 		dmu_tx_commit(tx);
 	} else {