rmmod: Teach rmmod about builtin modules

Currently modprobe -r will fail if a module is built in and report that it
is built in.  rmmod calls the same function to determine state but doesn't
handle the KMOD_MODULE_BUILTIN return code.  This leads to confusing errors
like this:

	libkmod: kmod_module_get_holders: could not open '/sys/module/loop/holders': No such file or directory
	Error: Module loop is in use

Fix this so that it actually reports the correct problem to the user.

diff --git a/tools/rmmod.c b/tools/rmmod.c
index 7f2c2f6..bf5a408 100644 (file)
--- a/tools/rmmod.c
+++ b/tools/rmmod.c
@@ -62,8 +62,14 @@ static void help(void)
 
 static int check_module_inuse(struct kmod_module *mod) {
        struct kmod_list *holders;
+       int state;
 
-       if (kmod_module_get_initstate(mod) == -ENOENT) {
+       state = kmod_module_get_initstate(mod);
+
+       if (state == KMOD_MODULE_BUILTIN) {
+               ERR("Module %s is builtin.\n", kmod_module_get_name(mod));
+               return -ENOENT;
+       } else if (state < 0) {
                ERR("Module %s is not currently loaded\n",
                                kmod_module_get_name(mod));
                return -ENOENT;