2017-04-19 01:47:50

by gfree.wind

Subject: [PATCH] module: Unify the return value type of try_module_get

From: Gao Feng <[email protected]>

The prototypes of try_module_get are different with different macro.
When enable module and module unload, it returns bool, but others not.
Now unify their return value type as bool.

Signed-off-by: Gao Feng <[email protected]>
---
include/linux/module.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/module.h b/include/linux/module.h
index 0297c5c..6b79eb7 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -582,7 +582,7 @@ extern void __noreturn __module_put_and_exit(struct module *mod,
extern void module_put(struct module *module);

#else /*!CONFIG_MODULE_UNLOAD*/
-static inline int try_module_get(struct module *module)
+static inline bool try_module_get(struct module *module)
{
return !module || module_is_live(module);
}
@@ -674,9 +674,9 @@ static inline void __module_get(struct module *module)
{
}

-static inline int try_module_get(struct module *module)
+static inline bool try_module_get(struct module *module)
{
- return 1;
+ return true;
}

static inline void module_put(struct module *module)
--
1.9.1

2017-04-24 04:45:03

by Jessica Yu

Subject: Re: [PATCH] module: Unify the return value type of try_module_get

+++ [email protected] [19/04/17 09:47 +0800]:
>From: Gao Feng <[email protected]>
>
>The prototypes of try_module_get are different with different macro.
>When enable module and module unload, it returns bool, but others not.
>Now unify their return value type as bool.
>
>Signed-off-by: Gao Feng <[email protected]>

Applied, thanks for the clean-up!

Jessica

>---
> include/linux/module.h | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/include/linux/module.h b/include/linux/module.h
>index 0297c5c..6b79eb7 100644
>--- a/include/linux/module.h
>+++ b/include/linux/module.h
>@@ -582,7 +582,7 @@ extern void __noreturn __module_put_and_exit(struct module *mod,
> extern void module_put(struct module *module);
>
> #else /*!CONFIG_MODULE_UNLOAD*/
>-static inline int try_module_get(struct module *module)
>+static inline bool try_module_get(struct module *module)
> {
> return !module || module_is_live(module);
> }
>@@ -674,9 +674,9 @@ static inline void __module_get(struct module *module)
> {
> }
>
>-static inline int try_module_get(struct module *module)
>+static inline bool try_module_get(struct module *module)
> {
>- return 1;
>+ return true;
> }
>
> static inline void module_put(struct module *module)
>--
>1.9.1
>
>
>
>