History

Remove "unsafe" from module struct

Adrian Bunk points out that "unsafe" was used to mark modules touched by the deprecated MOD_INC_USE_COUNT interface, which has long gone. It's time to remove the member from the module structure, as well. If you want a module which can't unload, don't register an exit function. (Vlad Yasevich says SCTP is now safe to unload, so just remove the __unsafe there).

Rusty Russell committed 19 years ago

Commit af49d921 parent d9c9bef4 files · +9 −37Browse files

Showing the changes to kernel/module.c (1 of 4 files). Show all

Unified · Split

kernel/module.c+5−16
@@ -692,8 +692,7 @@ sys_delete_module(const char __user *name_user, unsigned int flags) · 691 unmodified lines
692 }692 }
693 693
694 /* If it has an init func, it must have an exit func to unload */694 /* If it has an init func, it must have an exit func to unload */
695 if ((mod->init != NULL && mod->exit == NULL)695 if (mod->init && !mod->exit) {
696 || mod->unsafe) {
697 forced = try_force_unload(flags);696 forced = try_force_unload(flags);
698 if (!forced) {697 if (!forced) {
699 /* This module can't be removed */698 /* This module can't be removed */
@@ -741,11 +740,6 @@ static void print_unload_info(struct seq_file *m, struct module *mod) · 41 unmodified lines
741 seq_printf(m, "%s,", use->module_which_uses->name);740 seq_printf(m, "%s,", use->module_which_uses->name);
742 }741 }
743 742
744 if (mod->unsafe) {
745 printed_something = 1;
746 seq_printf(m, "[unsafe],");
747 }
748
749 if (mod->init != NULL && mod->exit == NULL) {743 if (mod->init != NULL && mod->exit == NULL) {
750 printed_something = 1;744 printed_something = 1;
751 seq_printf(m, "[permanent],");745 seq_printf(m, "[permanent],");
@@ -2011,15 +2005,10 @@ sys_init_module(void __user *umod, · 1259 unmodified lines
2011 buggy refcounters. */2005 buggy refcounters. */
2012 mod->state = MODULE_STATE_GOING;2006 mod->state = MODULE_STATE_GOING;
2013 synchronize_sched();2007 synchronize_sched();
2014 if (mod->unsafe)2008 module_put(mod);
2015 printk(KERN_ERR "%s: module is now stuck!\n",2009 mutex_lock(&module_mutex);
2016 mod->name);2010 free_module(mod);
2017 else {2011 mutex_unlock(&module_mutex);
2018 module_put(mod);
2019 mutex_lock(&module_mutex);
2020 free_module(mod);
2021 mutex_unlock(&module_mutex);
2022 }
2023 return ret;2012 return ret;
2024 }2013 }
2025 2014

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t