Backported to vz7 kernel,
fixes mainline patch 3f2b9c9cd backprted to Kirill Tkhai for PSBM-27580
commit 79465d2fd48e68940c2bdecddbdecd45bbba06fe
Author: Rusty Russell <[email protected]>
Date: Mon Apr 28 11:05:43 2014 +0930
module: remove warning about waiting module removal.
We remove the waiting module removal in commit 3f2b9c9cdf38 (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: 3f2b9c9cdf389e303b2273679af08aab5f153517
Reported-by: Valerio Vanni <[email protected]>
Cc: Elliott, Robert (Server Storage) <[email protected]>
Cc: [email protected]
Acked-by: Lucas De Marchi <[email protected]>
Signed-off-by: Rusty Russell <[email protected]>
https://bugs.openvz.org/browse/OVZ-6748
Signed-off-by: Vasily Averin <[email protected]>
diff --git a/kernel/module.c b/kernel/module.c
index 10e1384..762716f 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -892,11 +892,6 @@ SYSCALL_DEFINE2(delete_module, const char __user *,
name_user,
return -EFAULT;
name[MODULE_NAME_LEN-1] = '\0';
- if (!(flags & O_NONBLOCK)) {
- printk(KERN_WARNING
- "waiting module removal not supported: please upgrade");
- }
-
if (mutex_lock_interruptible(&module_mutex) != 0)
return -EINTR;
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
