Linus, please apply.
Name: Modules without init functions don't need exit functions
Author: Rusty Russell
Status: Trivial
D: If modules don't use module_exit(), they cannot be unloaded. This
D: safety mechanism should not apply for modules which don't use
D: module_init() (implying they have nothing to clean up anyway).
diff -urNp --exclude TAGS -X /home/rusty/current-dontdiff --minimal linux-2.5.52/kernel/module.c working-2.5.52-noexit/kernel/module.c
--- linux-2.5.52/kernel/module.c Tue Dec 17 08:11:03 2002
+++ working-2.5.52-noexit/kernel/module.c Mon Dec 23 11:26:36 2002
@@ -405,7 +405,8 @@ sys_delete_module(const char *name_user,
}
}
- if (!mod->exit || mod->unsafe) {
+ /* If it has an init func, it must have an exit func to unload */
+ if ((mod->init && !mod->exit) || mod->unsafe) {
forced = try_force(flags);
if (!forced) {
/* This module can't be removed */
@@ -473,7 +474,7 @@ static void print_unload_info(struct seq
if (mod->unsafe)
seq_printf(m, " [unsafe]");
- if (!mod->exit)
+ if (mod->init && !mod->exit)
seq_printf(m, " [permanent]");
seq_printf(m, "\n");
-- Anyone who quotes me in their sig is an idiot. -- Rusty Russell. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Tue Dec 31 2002 - 22:00:09 EST