From: Lucas De Marchi <lucas.demarchi@intel.com>
To: linux-modules@vger.kernel.org
Cc: Luis Chamberlain <mcgrof@kernel.org>,
Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [PATCH 3/4] modprobe: move check for remove_holders to caller
Date: Tue, 29 Mar 2022 02:05:39 -0700 [thread overview]
Message-ID: <20220329090540.38255-6-lucas.demarchi@intel.com> (raw)
In-Reply-To: <20220329090540.38255-1-lucas.demarchi@intel.com>
Do not mix the flags with and additional boolean from arguments.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
tools/modprobe.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/modprobe.c b/tools/modprobe.c
index ceb4ff6..0d9b805 100644
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -418,7 +418,7 @@ static int rmmod_do_module(struct kmod_module *mod, int flags)
rmmod_do_modlist(post, false);
- if ((flags & RMMOD_FLAG_REMOVE_HOLDERS) && remove_holders) {
+ if (flags & RMMOD_FLAG_REMOVE_HOLDERS) {
struct kmod_list *holders = kmod_module_get_holders(mod);
err = rmmod_do_modlist(holders, true);
@@ -471,7 +471,9 @@ static int rmmod(struct kmod_ctx *ctx, const char *alias)
kmod_list_foreach(l, list) {
struct kmod_module *mod = kmod_module_get_module(l);
- err = rmmod_do_module(mod, RMMOD_FLAG_REMOVE_HOLDERS);
+ int flags = remove_holders ? RMMOD_FLAG_REMOVE_HOLDERS : 0;
+
+ err = rmmod_do_module(mod, flags);
kmod_module_unref(mod);
if (err < 0)
break;
--
2.35.1
next prev parent reply other threads:[~2022-03-29 9:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-29 9:05 [PATCH 0/4] modprobe -r fixes and refactors Lucas De Marchi
2022-03-29 9:05 ` [PATCH 1/4] modprobe: Rename rmmod_do_deps_list Lucas De Marchi
2022-03-29 19:37 ` Luis Chamberlain
2022-03-29 9:05 ` [PATCH 1/4] modprobe: rename rmmod_do_deps_list Lucas De Marchi
2022-03-29 9:05 ` [PATCH 2/4] modprobe: Fix holders removal Lucas De Marchi
2022-04-06 22:20 ` Luis Chamberlain
2022-03-29 9:05 ` [PATCH 3/4] modprobe: Move check for remove_holders to caller Lucas De Marchi
2022-04-06 22:21 ` Luis Chamberlain
2022-03-29 9:05 ` Lucas De Marchi [this message]
2022-03-29 9:05 ` [PATCH 4/4] modprobe: Make rmmod_do_module() contain all the removal sequence Lucas De Marchi
2022-04-06 22:22 ` Luis Chamberlain
2022-04-07 5:05 ` Lucas De Marchi
2022-03-29 9:09 ` [PATCH 0/4] modprobe -r fixes and refactors Lucas De Marchi
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=20220329090540.38255-6-lucas.demarchi@intel.com \
--to=lucas.demarchi@intel.com \
--cc=linux-modules@vger.kernel.org \
--cc=mcgrof@kernel.org \
/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.