Skip to content

Commit

Permalink
module: remove warning about waiting module removal.
Browse files Browse the repository at this point in the history
We remove the waiting module removal in commit 3f2b9c9 (September
2013), but it turns out that modprobe in kmod (< version 16) was
asking for waiting module removal.  No one noticed since modprobe would
check for 0 usage immediately before trying to remove the module, and
the race is unlikely.

However, it means that anyone running old (but not ancient) kmod
versions is hitting the printk designed to see if anyone was running
"rmmod -w".  All reports so far have been false positives, so remove
the warning.

Fixes: 3f2b9c9
Reported-by: Valerio Vanni <valerio.vanni@inwind.it>
Cc: Elliott, Robert (Server Storage) <Elliott@hp.com>
Cc: stable@kernel.org
Acked-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
Rusty Russell committed Apr 28, 2014
1 parent 132e9a6 commit 79465d2
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -815,9 +815,6 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
return -EFAULT;
name[MODULE_NAME_LEN-1] = '\0';

if (!(flags & O_NONBLOCK))
pr_warn("waiting module removal not supported: please upgrade\n");

if (mutex_lock_interruptible(&module_mutex) != 0)
return -EINTR;

Expand Down

0 comments on commit 79465d2

Please sign in to comment.