All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Kjellerstedt <pkj@axis.com>
To: <linux-modules@vger.kernel.org>
Cc: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Subject: [PATCH] libkmod: Always search modules.builtin if no alias has been found
Date: Wed, 5 May 2021 01:58:36 +0200	[thread overview]
Message-ID: <20210504235836.24246-1-pkj@axis.com> (raw)

Commit 89443220e broke the lookup for builtin modules. modules.builtin
was no longer searched if kmod_lookup_alias_from_kernel_builtin_file()
returned 0.

Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---

I do not know if this is the correct thing to do, or if the commit
message makes any sense. However, it solves the problem we were seeing.
We use fuse, which installs /etc/modules-load.d/fuse.conf to load the
fuse kernel module. However, we have fuse built-in. Normally, the
following can be seen in the log:

  systemd-modules-load[192]: Module 'fuse' is built in

but after commit 89443220e, we instead got:

  systemd-modules-load[193]: Failed to find module 'fuse'

//Peter

 libkmod/libkmod-module.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
index 76a6dc3..6720930 100644
--- a/libkmod/libkmod-module.c
+++ b/libkmod/libkmod-module.c
@@ -577,7 +577,7 @@ KMOD_EXPORT int kmod_module_new_from_lookup(struct kmod_ctx *ctx,
 
 	DBG(ctx, "lookup modules.builtin.modinfo %s\n", alias);
 	err = kmod_lookup_alias_from_kernel_builtin_file(ctx, alias, list);
-	if (err == -ENOSYS) {
+	if (err == 0 || err == -ENOSYS) {
 		/* Optional index missing, try the old one */
 		DBG(ctx, "lookup modules.builtin %s\n", alias);
 		err = kmod_lookup_alias_from_builtin_file(ctx, alias, list);

             reply	other threads:[~2021-05-04 23:58 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-04 23:58 Peter Kjellerstedt [this message]
2021-05-09  5:55 ` [PATCH] libkmod: Always search modules.builtin if no alias has been found Lucas De Marchi
2021-05-10 13:55   ` Peter Kjellerstedt
2021-05-11 16:58     ` Lucas De Marchi
2021-05-11 18:01       ` Lucas De Marchi
2021-05-12 13:30         ` Peter Kjellerstedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210504235836.24246-1-pkj@axis.com \
    --to=pkj@axis.com \
    --cc=linux-modules@vger.kernel.org \
    --cc=peter.kjellerstedt@axis.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.