modprobe: don't run remove commands for modules which are not loaded

modprobe.d(5) strongly suggests you can use remove commands like this:

    remove snd-pcm /sbin/modprobe -r --ignore-remove snd-pcm-oss && \
	/sbin/modprobe -r snd-pcm

Unfortunately, given that snd-pcm-oss depends on snd-pcm, this causes
an infinite fork-loop.

The solution is an exact parallel of the approach taken for install
commands.  AFAIK no-one uses remove commands, but it's good to make
the insmod() and rmmod() functions consistent.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>

1 files changed, 4 insertions, 3 deletions

diff --git a/modprobe.c b/modprobe.c
index e6fad70..8067e5c 100644
--- a/modprobe.c
+++ b/modprobe.c
@@ -1293,6 +1293,10 @@ static void rmmod(struct list_head *list,
 	if (!name)
 		name = mod->modname;
 
+	/* Don't do ANYTHING if not loaded. */
+	if (module_in_kernel(name, &usecount) == 0)
+		goto nonexistent_module;
+
 	/* Even if renamed, find commands to orig. name. */
 	command = find_command(mod->modname, commands);
 	if (command && !(flags & mit_ignore_commands)) {
@@ -1301,9 +1305,6 @@ static void rmmod(struct list_head *list,
 		goto remove_rest;
 	}
 
-	if (module_in_kernel(name, &usecount) == 0)
-		goto nonexistent_module;
-
 	if (usecount != 0) {
 		if (!(flags & mit_ignore_loaded))
 			error("Module %s is in use.\n", name);