mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

module: don't use stop_machine for waiting rmmod

Browse source 
rmmod has a little-used "-w" option, meaning that instead of failing if the
module is in use, it should block until the module becomes unused.

In this case, we don't need to use stop_machine: Max Krasnyansky
indicated that would be useful for SystemTap which loads/unloads new
modules frequently.

Cc: Max Krasnyansky <maxk@qualcomm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2008-07-22 19:24:25 -05:00
parent 93ded9b8fd
commit da39ba5e1d
1 changed files with 11 additions and 4 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

11
kernel/module.c
View file

@ -639,8 +639,8 @@ static int __try_stop_module(void *_sref)
{ {
struct stopref *sref = _sref; struct stopref *sref = _sref;
/* If it's not unused, quit unless we are told to block. */ /* If it's not unused, quit unless we're forcing. */
if ((sref->flags & O_NONBLOCK) && module_refcount(sref->mod) != 0) { if (module_refcount(sref->mod) != 0) {
if (!(*sref->forced = try_force_unload(sref->flags))) if (!(*sref->forced = try_force_unload(sref->flags)))
return -EWOULDBLOCK; return -EWOULDBLOCK;
} }
@ -652,9 +652,16 @@ static int __try_stop_module(void *_sref)
static int try_stop_module(struct module *mod, int flags, int *forced) static int try_stop_module(struct module *mod, int flags, int *forced)
{ {
if (flags & O_NONBLOCK) {
struct stopref sref = { mod, flags, forced }; struct stopref sref = { mod, flags, forced };
return stop_machine_run(__try_stop_module, &sref, NR_CPUS); return stop_machine_run(__try_stop_module, &sref, NR_CPUS);
} else {
/* We don't need to stop the machine for this. */
mod->state = MODULE_STATE_GOING;
synchronize_sched();
return 0;
}
} }
unsigned int module_refcount(struct module *mod) unsigned int module_refcount(struct module *mod)