From 78ecf5f6106feddd2180c6ff36e3469205597a2a Mon Sep 17 00:00:00 2001 From: Peter Oberparleiter Date: Mon, 21 Apr 2008 14:34:31 +0200 Subject: [PATCH] --- yaml --- r: 95718 b: refs/heads/master c: df4b565e1fbc777bb6e274378a41fa8ff7485680 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/module.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0a8ec714c7fa..d6c85cd2041a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b211104d111c99dbb97c636b57bd9db711455684 +refs/heads/master: df4b565e1fbc777bb6e274378a41fa8ff7485680 diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c index d2d093e74165..8674a390a2e8 100644 --- a/trunk/kernel/module.c +++ b/trunk/kernel/module.c @@ -745,12 +745,13 @@ sys_delete_module(const char __user *name_user, unsigned int flags) if (!forced && module_refcount(mod) != 0) wait_for_zero_refcount(mod); + mutex_unlock(&module_mutex); /* Final destruction now noone is using it. */ - if (mod->exit != NULL) { - mutex_unlock(&module_mutex); + if (mod->exit != NULL) mod->exit(); - mutex_lock(&module_mutex); - } + blocking_notifier_call_chain(&module_notify_list, + MODULE_STATE_GOING, mod); + mutex_lock(&module_mutex); /* Store the name of the last unloaded module for diagnostic purposes */ strlcpy(last_unloaded_module, mod->name, sizeof(last_unloaded_module)); free_module(mod); @@ -2191,6 +2192,8 @@ sys_init_module(void __user *umod, mod->state = MODULE_STATE_GOING; synchronize_sched(); module_put(mod); + blocking_notifier_call_chain(&module_notify_list, + MODULE_STATE_GOING, mod); mutex_lock(&module_mutex); free_module(mod); mutex_unlock(&module_mutex);