emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixup some cases of "QM_MODULES: not implemented" for both

Browse Source 
lsmod and rmmod when using 2.6.x module support
 -Erik
This commit is contained in:
Eric Andersen 2004-07-13 00:09:34 +00:00
parent fe9b9cdfa5
commit e8521f14a2
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modutils/Config.in
View File

@ -81,13 +81,7 @@ config CONFIG_LSMOD
lsmod is used to display a list of loaded modules. lsmod is used to display a list of loaded modules.
config CONFIG_FEATURE_QUERY_MODULE_INTERFACE config CONFIG_FEATURE_QUERY_MODULE_INTERFACE
bool " Support lsmod query_module interface (add 638 bytes)" depends on CONFIG_FEATURE_2_4_MODULES && !CONFIG_FEATURE_2_6_MODULES
default y
depends on CONFIG_LSMOD && ( CONFIG_FEATURE_2_4_MODULES || CONFIG_FEATURE_2_6_MODULES )
help
This will provide some extra information about each module when
running lsmod. The fields provided are address, size, flags and
usage count.
config CONFIG_MODPROBE config CONFIG_MODPROBE
bool "modprobe" bool "modprobe"

15
modutils/rmmod.c
View File

@ -34,9 +34,11 @@ extern int rmmod_main(int argc, char **argv)
int n, ret = EXIT_SUCCESS; int n, ret = EXIT_SUCCESS;
size_t nmod = 0; /* number of modules */ size_t nmod = 0; /* number of modules */
size_t pnmod = -1; /* previous number of modules */ size_t pnmod = -1; /* previous number of modules */
unsigned int flags = O_NONBLOCK|O_EXCL;
#ifdef CONFIG_FEATURE_QUERY_MODULE_INTERFACE
void *buf; /* hold the module names which we ignore but must get */ void *buf; /* hold the module names which we ignore but must get */
size_t bufsize = 0; size_t bufsize = 0;
unsigned int flags = O_NONBLOCK|O_EXCL; #endif
/* Parse command line. */ /* Parse command line. */
while ((n = getopt(argc, argv, "a")) != EOF) { while ((n = getopt(argc, argv, "a")) != EOF) {
@ -50,17 +52,24 @@ extern int rmmod_main(int argc, char **argv)
case 'a': case 'a':
/* Unload _all_ unused modules via NULL delete_module() call */ /* Unload _all_ unused modules via NULL delete_module() call */
/* until the number of modules does not change */ /* until the number of modules does not change */
#ifdef CONFIG_FEATURE_QUERY_MODULE_INTERFACE
buf = xmalloc(bufsize = 256); buf = xmalloc(bufsize = 256);
#endif
while (nmod != pnmod) { while (nmod != pnmod) {
if (syscall(__NR_delete_module, NULL, flags) < 0) if (syscall(__NR_delete_module, NULL, flags) < 0) {
if (errno==EFAULT)
return(ret);
bb_perror_msg_and_die("rmmod"); bb_perror_msg_and_die("rmmod");
}
pnmod = nmod; pnmod = nmod;
#ifdef CONFIG_FEATURE_QUERY_MODULE_INTERFACE
/* 1 == QM_MODULES */ /* 1 == QM_MODULES */
if (my_query_module(NULL, 1, &buf, &bufsize, &nmod)) { if (my_query_module(NULL, 1, &buf, &bufsize, &nmod)) {
bb_perror_msg_and_die("QM_MODULES"); bb_perror_msg_and_die("QM_MODULES");
} }
#endif
} }
#ifdef CONFIG_FEATURE_CLEAN_UP #if defined CONFIG_FEATURE_CLEAN_UP && CONFIG_FEATURE_QUERY_MODULE_INTERFACE
free(buf); free(buf);
#endif #endif
return EXIT_SUCCESS; return EXIT_SUCCESS;