depmod: fix hash lookup by relpath instead of uncrelpath

We index modules in depmod by it's uncompressed relative path, not
relative path. We didn't notice this bug before since this function is
only triggered if we release a module to be replaced by one of higher
priority.

Also fix a leftover log message referring to relpath instead of
uncrelpath.

diff --git a/tools/depmod.c b/tools/depmod.c
index cc9346fe69c64ffa0ecd5c2ee094387d62d88e38..aafe66b113040f975982a4fd72a61602c5eefdbd 100644 (file)
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -1114,7 +1114,7 @@ static int depmod_module_add(struct depmod *depmod, struct kmod_module *kmod)
                                      mod->uncrelpath, mod);
                if (err < 0) {
                        ERR("hash_add_unique %s: %s\n",
-                           mod->relpath, strerror(-err));
+                           mod->uncrelpath, strerror(-err));
                        hash_del(depmod->modules_by_name, mod->modname);
                        goto fail;
                }
@@ -1134,8 +1134,8 @@ static int depmod_module_del(struct depmod *depmod, struct mod *mod)
 {
        DBG("del %p kmod=%p, path=%s\n", mod, mod->kmod, mod->path);
 
-       if (mod->relpath != NULL)
-               hash_del(depmod->modules_by_uncrelpath, mod->relpath);
+       if (mod->uncrelpath != NULL)
+               hash_del(depmod->modules_by_uncrelpath, mod->uncrelpath);
 
        hash_del(depmod->modules_by_name, mod->modname);