From 519a4be18951cd8cc2f5a63392ee3611a6cbea82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Jaroszy=C5=84ski?= Date: Wed, 14 Jul 2010 22:25:55 +0200 Subject: [PATCH] [settings] Unregister the children when unregistering the parent The DHCP settings registered as a child of the netdevice settings are not unregistered anywhere. This prevents the netdevice from being freed on shutdown. Fix by automatically unregistering any child settings when the parent settings are unregistered. Modified-by: Michael Brown Signed-off-by: Michael Brown --- src/core/settings.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/core/settings.c b/src/core/settings.c index 427b9ed6..79fb8e72 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -459,15 +459,22 @@ int register_settings ( struct settings *settings, struct settings *parent ) { * @v settings Settings block */ void unregister_settings ( struct settings *settings ) { + struct settings *child; + struct settings *tmp; + + /* Unregister child settings */ + list_for_each_entry_safe ( child, tmp, &settings->children, siblings ) { + unregister_settings ( child ); + } DBGC ( settings, "Settings %p (\"%s\") unregistered\n", settings, settings_name ( settings ) ); /* Remove from list of settings */ - ref_put ( settings->refcnt ); ref_put ( settings->parent->refcnt ); settings->parent = NULL; list_del ( &settings->siblings ); + ref_put ( settings->refcnt ); /* Apply potentially-updated settings */ apply_settings();