Merge pull request #800 from tempesta-tech/ao-794

Bugfix #794: Detach scheduler from server group before servers' destruction.
tempesta-tech · Aug 16, 2017 · 65d9723 · 65d9723
2 parents 85ac463 + 825f006
commit 65d9723
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tempesta_fw/server.c b/tempesta_fw/server.c
@@ -235,10 +235,10 @@ tfw_sg_release_all(void)
 	TfwSrvGroup *sg, *sg_tmp;
 
 	list_for_each_entry_safe(sg, sg_tmp, &sg_list, list) {
-		list_for_each_entry_safe(srv, srv_tmp, &sg->srv_list, list)
-			tfw_server_destroy(srv);
 		if (sg->sched && sg->sched->del_grp)
 			sg->sched->del_grp(sg);
+		list_for_each_entry_safe(srv, srv_tmp, &sg->srv_list, list)
+			tfw_server_destroy(srv);
 		kfree(sg);
 	}
 	INIT_LIST_HEAD(&sg_list);