Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / net / ipv4 / ipvs / ip_vs_app.c

diff --git a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c
index 664cb8e97c1c515202d8bd6f05cca73bd9e789b1..535abe0c45e7f4fc4e71c401f249e58bdf9d90eb 100644 (file)
--- a/net/ipv4/ipvs/ip_vs_app.c
+++ b/net/ipv4/ipvs/ip_vs_app.c
@@ -51,18 +51,13 @@ static DEFINE_MUTEX(__ip_vs_app_mutex);
  */
 static inline int ip_vs_app_get(struct ip_vs_app *app)
 {
-       /* test and get the module atomically */
-       if (app->module)
-               return try_module_get(app->module);
-       else
-               return 1;
+       return try_module_get(app->module);
 }
 
 
 static inline void ip_vs_app_put(struct ip_vs_app *app)
 {
-       if (app->module)
-               module_put(app->module);
+       module_put(app->module);
 }