picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

unit: free data from merged unit when we don't need it anymore

This commit is contained in:
Lennart Poettering 2010-04-10 04:43:21 +02:00
parent 819e213fbf
commit 3616a49cb0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unit.c
View File

@ -424,11 +424,16 @@ int unit_merge(Unit *u, Unit *other) {
for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
merge_dependencies(u, other, d);
unit_add_to_dbus_queue(u);
other->meta.load_state = UNIT_MERGED;
other->meta.merged_into = u;
/* If there is still some data attached to the other node, we
* don't need it anymore, and can free it. */
if (other->meta.load_state != UNIT_STUB)
if (UNIT_VTABLE(other)->done)
UNIT_VTABLE(other)->done(other);
unit_add_to_dbus_queue(u);
unit_add_to_cleanup_queue(other);
return 0;