diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-08-29 18:40:15 +0200 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-11-01 00:32:34 +0100 |
| commit | 69e7dae4096caeea0a7e2ede376f22a4fdee8456 (patch) | |
| tree | eb3ac23820052da46982c1ea1a818fb949d9838f | |
| parent | nf_conntrack.h: fix up fallout from implicit moduleparam.h presence (diff) | |
| download | linux-69e7dae4096caeea0a7e2ede376f22a4fdee8456.tar.xz linux-69e7dae4096caeea0a7e2ede376f22a4fdee8456.zip | |
ip_vs.h: fix implicit use of module_get/module_put from module.h
This file was using the module get/put functions in two simple inline
functions. But module_get/put were only within scope because of
the implicit presence of module.h being everywhere.
Rather than add module.h to another file in include/ -- which is
exactly the thing we are trying to avoid, simply convert these
one-line functions into a define, as per what was done for the
device_schedule_callback() in commit 523ded71de0c5e669733.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | include/net/ip_vs.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 8fa4430f99c1..623916acbf31 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -1126,17 +1126,16 @@ int unregister_ip_vs_pe(struct ip_vs_pe *pe); struct ip_vs_pe *ip_vs_pe_getbyname(const char *name); struct ip_vs_pe *__ip_vs_pe_getbyname(const char *pe_name); -static inline void ip_vs_pe_get(const struct ip_vs_pe *pe) -{ - if (pe && pe->module) +/* + * Use a #define to avoid all of module.h just for these trivial ops + */ +#define ip_vs_pe_get(pe) \ + if (pe && pe->module) \ __module_get(pe->module); -} -static inline void ip_vs_pe_put(const struct ip_vs_pe *pe) -{ - if (pe && pe->module) +#define ip_vs_pe_put(pe) \ + if (pe && pe->module) \ module_put(pe->module); -} /* * IPVS protocol functions (from ip_vs_proto.c) |