diff options
| -rw-r--r-- | kernel/module.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/module.c b/kernel/module.c index fb6f091f5940..f368812ac0e8 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -496,15 +496,15 @@ static void module_unload_free(struct module *mod) | |||
| 496 | } | 496 | } |
| 497 | 497 | ||
| 498 | #ifdef CONFIG_MODULE_FORCE_UNLOAD | 498 | #ifdef CONFIG_MODULE_FORCE_UNLOAD |
| 499 | static inline int try_force(unsigned int flags) | 499 | static inline int try_force_unload(unsigned int flags) |
| 500 | { | 500 | { |
| 501 | int ret = (flags & O_TRUNC); | 501 | int ret = (flags & O_TRUNC); |
| 502 | if (ret) | 502 | if (ret) |
| 503 | add_taint(TAINT_FORCED_MODULE); | 503 | add_taint(TAINT_FORCED_RMMOD); |
| 504 | return ret; | 504 | return ret; |
| 505 | } | 505 | } |
| 506 | #else | 506 | #else |
| 507 | static inline int try_force(unsigned int flags) | 507 | static inline int try_force_unload(unsigned int flags) |
| 508 | { | 508 | { |
| 509 | return 0; | 509 | return 0; |
| 510 | } | 510 | } |
| @@ -524,7 +524,7 @@ static int __try_stop_module(void *_sref) | |||
| 524 | 524 | ||
| 525 | /* If it's not unused, quit unless we are told to block. */ | 525 | /* If it's not unused, quit unless we are told to block. */ |
| 526 | if ((sref->flags & O_NONBLOCK) && module_refcount(sref->mod) != 0) { | 526 | if ((sref->flags & O_NONBLOCK) && module_refcount(sref->mod) != 0) { |
| 527 | if (!(*sref->forced = try_force(sref->flags))) | 527 | if (!(*sref->forced = try_force_unload(sref->flags))) |
| 528 | return -EWOULDBLOCK; | 528 | return -EWOULDBLOCK; |
| 529 | } | 529 | } |
| 530 | 530 | ||
| @@ -609,7 +609,7 @@ sys_delete_module(const char __user *name_user, unsigned int flags) | |||
| 609 | /* If it has an init func, it must have an exit func to unload */ | 609 | /* If it has an init func, it must have an exit func to unload */ |
| 610 | if ((mod->init != NULL && mod->exit == NULL) | 610 | if ((mod->init != NULL && mod->exit == NULL) |
| 611 | || mod->unsafe) { | 611 | || mod->unsafe) { |
| 612 | forced = try_force(flags); | 612 | forced = try_force_unload(flags); |
| 613 | if (!forced) { | 613 | if (!forced) { |
| 614 | /* This module can't be removed */ | 614 | /* This module can't be removed */ |
| 615 | ret = -EBUSY; | 615 | ret = -EBUSY; |
