fsm: Add ni_fsm_purge_children() on worker destroy

openSUSE · Jun 26, 2014 · 4d3d7da · 4d3d7da
1 parent c7ae272
commit 4d3d7da
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/fsm.c b/src/fsm.c
@@ -2118,6 +2118,13 @@ ni_fsm_reset_matching_workers(ni_fsm_t *fsm, ni_ifworker_array_t *marked,
 	}
 }
 
+static inline void
+ni_fsm_purge_children(ni_fsm_t *fsm, ni_ifworker_t *w)
+{
+	if (w->exclusive_owner)
+		ni_ifworker_array_remove(&w->exclusive_owner->children, w);
+}
+
 ni_bool_t
 ni_fsm_destroy_worker(ni_fsm_t *fsm, ni_ifworker_t *w)
 {
@@ -2136,8 +2143,8 @@ ni_fsm_destroy_worker(ni_fsm_t *fsm, ni_ifworker_t *w)
 
 	if (ni_ifworker_active(w))
 		ni_ifworker_fail(w, "device was deleted");
-	w->dead = TRUE;
 
+	ni_fsm_purge_children(fsm, w);
 	ni_ifworker_release(w);
 	return TRUE;
 }