[3.13.y.z extended stable] Patch "module: remove warning about waiting module removal." has been added to staging queue

[Kamal Mostafa]

This is a note to let you know that I have just added a patch titled

    module: remove warning about waiting module removal.

to the linux-3.13.y-queue branch of the 3.13.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.13.y-queue

This patch is scheduled to be released in version 3.13.11.3.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.13.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Kamal

------

>From 9cdc111418afbb3af8d43aaeff32f8e7e34281d4 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty at rustcorp.com.au>
Date: Mon, 28 Apr 2014 11:05:43 +0930
Subject: module: remove warning about waiting module removal.

commit 79465d2fd48e68940c2bdecddbdecd45bbba06fe upstream.

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 <valerio.vanni at inwind.it>
Cc: Elliott, Robert (Server Storage) <Elliott at hp.com>
Acked-by: Lucas De Marchi <lucas.de.marchi at gmail.com>
Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>
[ kamal: backport to 3.13: context ]
Signed-off-by: Kamal Mostafa <kamal at canonical.com>
---
 kernel/module.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/kernel/module.c b/kernel/module.c
index f5a3b1e..6b931bd 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -815,11 +815,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;

--
1.9.1