From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Wed, 17 Oct 2012 21:32:56 +0000 (-0300)
Subject: rmmod: Deprecate --wait option
X-Git-Tag: v11~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc833644b2193d661e4a9c06c047d1a527f3ecf4;p=thirdparty%2Fkmod.git

rmmod: Deprecate --wait option

Remove --wait from usage() and give a message + sleep(10) if user is in
fact using it.
---

diff --git a/TODO b/TODO
index 286eeda4..0987c430 100644
--- a/TODO
+++ b/TODO
@@ -35,9 +35,9 @@ Features:
 
 * Implement actions in kmod tool like 'insert', 'remove', 'info', etc
 
-* Deprecate "rmmod -w", friends and KMOD_REMOVE_NOWAIT from libkmod.
-  The blocking delete_module will be removed from the kernel. Deprecate it and
-  print a warning to the user because he shouldn't be using it.
+* Finish removal of "rmmod -w" when it's gone from kernel.
+
+* Deprecate not using KMOD_REMOVE_NOWAIT on libkmod.
 
 Things to be added/removed in kernel (check what is really needed):
 ===================================================================
diff --git a/tools/rmmod.c b/tools/rmmod.c
index 0aa6fb6f..843c4f54 100644
--- a/tools/rmmod.c
+++ b/tools/rmmod.c
@@ -52,8 +52,6 @@ static void help(const char *progname)
 		"\t-s, --syslog      print to syslog, not stderr\n"
 		"\t-v, --verbose     enables more messages\n"
 		"\t-V, --version     show version\n"
-		"\t-w, --wait        begins module removal even if it is used and\n"
-		"\t                  will stop new users from accessing it.\n"
 		"\t-h, --help        show this help\n",
 		progname);
 }
@@ -161,6 +159,8 @@ static int do_rmmod(int argc, char *argv[])
 			verbose++;
 			break;
 		case 'w':
+			fprintf(stderr, "'Wait' behavior is targeted for removal from kernel.\nWe will now sleep for 10s, and then continue.\n");
+			sleep(10);
 			flags &= ~KMOD_REMOVE_NOWAIT;
 			break;
 		case 'h':