tools: Print a message if refcnt attribute is missing
PATCH 1/1 tools: Print a message if refcnt attribute is missing
Currently, check_module_inuse returns a wrong user message if the kernel is built without module unloading support.
Fix it by returning a more specific error, in case 'refcnt' attribute is missing.
--- tools/remove.c | 9 ++++++--- tools/rmmod.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-)
tools/remove.c +6 -3
@@ -44,7 +44,7 @@ static void help(void)static int check_module_inuse (struct kmod_module *mod) {struct kmod_list *holders; -int state; +int state, ret; state =kmod_module_get_initstate (mod);
@@ -74,12 +74,15 @@ static int check_module_inuse(struct kmod_module *mod) {return -EBUSY ; } -if (kmod_module_get_refcnt (mod) !=0 ) { + ret =kmod_module_get_refcnt (mod); +if (ret >0 ) {ERR ("Module %s is in use\n" ,kmod_module_get_name (mod));return -EBUSY ; + }else if (ret == -ENOENT ) { +ERR ("Module unloading is not supported\n" ); } -return 0 ; +return ret; }static int do_remove (int argc,char *argv[])
tools/rmmod.c +6 -3
@@ -63,7 +63,7 @@ static void help(void)static int check_module_inuse (struct kmod_module *mod) {struct kmod_list *holders; -int state; +int state, ret; state =kmod_module_get_initstate (mod);
@@ -93,12 +93,15 @@ static int check_module_inuse(struct kmod_module *mod) {return -EBUSY ; } -if (kmod_module_get_refcnt (mod) !=0 ) { + ret =kmod_module_get_refcnt (mod); +if (ret >0 ) {ERR ("Module %s is in use\n" ,kmod_module_get_name (mod));return -EBUSY ; + }else if (ret == -ENOENT ) { +ERR ("Module unloading is not supported\n" ); } -return 0 ; +return ret; }static int do_rmmod (int argc,char *argv[])
Signature · 1 line
2.20.1
Lucas De Marchi
AppliedQuoted 5 lines · Ezequiel Garcia
Currently,
check_module_inusereturns a wrong user message if the kernel is built without module unloading support.Fix it by returning a more specific error, in case 'refcnt' attribute is missing.
Applied, thanks.
Lucas De Marchi
Quoted 70 lines
---
tools/remove.c| 9 ++++++---tools/rmmod.c| 9 ++++++---2 files changed, 12 insertions(+), 6 deletions(-)tools/remove.c +6
-3@@ -44,7 +44,7 @@ static void help(void)static int check_module_inuse (struct kmod_module *mod) {struct kmod_list *holders; -int state; +int state, ret; state =kmod_module_get_initstate (mod);@@ -74,12 +74,15 @@ static int check_module_inuse(struct kmod_module *mod) {return -EBUSY ; } -if (kmod_module_get_refcnt (mod) !=0 ) { + ret =kmod_module_get_refcnt (mod); +if (ret >0 ) {ERR ("Module %s is in use\n" ,kmod_module_get_name (mod));return -EBUSY ; + }else if (ret == -ENOENT ) { +ERR ("Module unloading is not supported\n" ); } -return 0 ; +return ret; }static int do_remove (int argc,char *argv[])tools/rmmod.c +6
-3@@ -63,7 +63,7 @@ static void help(void)static int check_module_inuse (struct kmod_module *mod) {struct kmod_list *holders; -int state; +int state, ret; state =kmod_module_get_initstate (mod);@@ -93,12 +93,15 @@ static int check_module_inuse(struct kmod_module *mod) {return -EBUSY ; } -if (kmod_module_get_refcnt (mod) !=0 ) { + ret =kmod_module_get_refcnt (mod); +if (ret >0 ) {ERR ("Module %s is in use\n" ,kmod_module_get_name (mod));return -EBUSY ; + }else if (ret == -ENOENT ) { +ERR ("Module unloading is not supported\n" ); } -return 0 ; +return ret; }static int do_rmmod (int argc,char *argv[])Signature · 1 line
2.20.1