modprobe: Rename rmmod_do_deps_list
It's used not only for dependencies, but also for pre and post softdep. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
This commit is contained in:
parent
205827426d
commit
7089386eef
|
@ -357,7 +357,8 @@ static int rmmod_do_remove_module(struct kmod_module *mod)
|
||||||
#define RMMOD_FLAG_IGNORE_BUILTIN 0x2
|
#define RMMOD_FLAG_IGNORE_BUILTIN 0x2
|
||||||
static int rmmod_do_module(struct kmod_module *mod, int flags);
|
static int rmmod_do_module(struct kmod_module *mod, int flags);
|
||||||
|
|
||||||
static int rmmod_do_deps_list(struct kmod_list *list, bool stop_on_errors)
|
/* Remove modules in reverse order */
|
||||||
|
static int rmmod_do_modlist(struct kmod_list *list, bool stop_on_errors)
|
||||||
{
|
{
|
||||||
struct kmod_list *l;
|
struct kmod_list *l;
|
||||||
|
|
||||||
|
@ -413,12 +414,12 @@ static int rmmod_do_module(struct kmod_module *mod, int flags)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
rmmod_do_deps_list(post, false);
|
rmmod_do_modlist(post, false);
|
||||||
|
|
||||||
if ((flags & RMMOD_FLAG_DO_DEPENDENCIES) && remove_dependencies) {
|
if ((flags & RMMOD_FLAG_DO_DEPENDENCIES) && remove_dependencies) {
|
||||||
struct kmod_list *deps = kmod_module_get_dependencies(mod);
|
struct kmod_list *deps = kmod_module_get_dependencies(mod);
|
||||||
|
|
||||||
err = rmmod_do_deps_list(deps, true);
|
err = rmmod_do_modlist(deps, true);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
@ -443,7 +444,7 @@ static int rmmod_do_module(struct kmod_module *mod, int flags)
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
rmmod_do_deps_list(pre, false);
|
rmmod_do_modlist(pre, false);
|
||||||
|
|
||||||
error:
|
error:
|
||||||
kmod_module_unref_list(pre);
|
kmod_module_unref_list(pre);
|
||||||
|
|
Loading…
Reference in New Issue