[patch v2 05/12] [PATCH 05/12] IPVS: Allow null argument to ip_vs

To:	lvs-devel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxxxxxx, netfilter@xxxxxxxxxxxxxxx, netfilter-devel@xxxxxxxxxxxxxxx
Subject:	[patch v2 05/12] [PATCH 05/12] IPVS: Allow null argument to ip_vs_scheduler_put()
Cc:	Jan Engelhardt <jengelh@xxxxxxxxxx>, Stephen Hemminger <shemminger@xxxxxxxxxx>, Wensong Zhang <wensong@xxxxxxxxxxxx>, Julian Anastasov <ja@xxxxxx>, Patrick McHardy <kaber@xxxxxxxxx>
From:	Simon Horman <horms@xxxxxxxxxxxx>
Date:	Fri, 01 Oct 2010 23:35:22 +0900

This simplifies caller logic sightly.

Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>
---

v2
* Trivial rediff

Index: lvs-test-2.6/net/netfilter/ipvs/ip_vs_ctl.c
===================================================================
--- lvs-test-2.6.orig/net/netfilter/ipvs/ip_vs_ctl.c    2010-10-01 
22:25:53.000000000 +0900
+++ lvs-test-2.6/net/netfilter/ipvs/ip_vs_ctl.c 2010-10-01 22:26:10.000000000 
+0900
@@ -1144,7 +1144,7 @@ ip_vs_add_service(struct ip_vs_service_u
        if (sched == NULL) {
                pr_info("Scheduler module ip_vs_%s not found\n", u->sched_name);
                ret = -ENOENT;
-               goto out_mod_dec;
+               goto out_err;
        }
 
 #ifdef CONFIG_IP_VS_IPV6
@@ -1204,7 +1204,7 @@ ip_vs_add_service(struct ip_vs_service_u
        *svc_p = svc;
        return 0;
 
-  out_err:
+ out_err:
        if (svc != NULL) {
                if (svc->scheduler)
                        ip_vs_unbind_scheduler(svc);
@@ -1217,7 +1217,6 @@ ip_vs_add_service(struct ip_vs_service_u
        }
        ip_vs_scheduler_put(sched);
 
-  out_mod_dec:
        /* decrease the module use count */
        ip_vs_use_count_dec();
 
@@ -1300,10 +1299,7 @@ ip_vs_edit_service(struct ip_vs_service
 #ifdef CONFIG_IP_VS_IPV6
   out:
 #endif
-
-       if (old_sched)
-               ip_vs_scheduler_put(old_sched);
-
+       ip_vs_scheduler_put(old_sched);
        return ret;
 }
 
@@ -1327,8 +1323,7 @@ static void __ip_vs_del_service(struct i
        /* Unbind scheduler */
        old_sched = svc->scheduler;
        ip_vs_unbind_scheduler(svc);
-       if (old_sched)
-               ip_vs_scheduler_put(old_sched);
+       ip_vs_scheduler_put(old_sched);
 
        /* Unbind app inc */
        if (svc->inc) {
Index: lvs-test-2.6/net/netfilter/ipvs/ip_vs_sched.c
===================================================================
--- lvs-test-2.6.orig/net/netfilter/ipvs/ip_vs_sched.c  2010-10-01 
22:25:53.000000000 +0900
+++ lvs-test-2.6/net/netfilter/ipvs/ip_vs_sched.c       2010-10-01 
22:26:10.000000000 +0900
@@ -159,7 +159,7 @@ struct ip_vs_scheduler *ip_vs_scheduler_
 
 void ip_vs_scheduler_put(struct ip_vs_scheduler *scheduler)
 {
-       if (scheduler->module)
+       if (scheduler && scheduler->module)
                module_put(scheduler->module);
 }
 

--
To unsubscribe from this list: send the line "unsubscribe lvs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

<Prev in Thread]	Current Thread	[Next in Thread>
[patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sched_persist(), (continued) [patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sched_persist(), Simon Horman Re: [patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sched_persist(), Julian Anastasov Re: [patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sched_persist(), Simon Horman Re: [patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sched_persist(), Julian Anastasov Re: [patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sched_persist(), Simon Horman Re: [patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sched_persist(), Julian Anastasov [patch v2 04/12] [PATCH 04/12] IPVS: Add struct ip_vs_conn_param, Simon Horman Re: [patch v2 04/12] [PATCH 04/12] IPVS: Add struct ip_vs_conn_param, Julian Anastasov Re: [patch v2 04/12] [PATCH 04/12] IPVS: Add struct ip_vs_conn_param, Simon Horman Re: [patch v2 04/12] [PATCH 04/12] IPVS: Add struct ip_vs_conn_param, Simon Horman [patch v2 05/12] [PATCH 05/12] IPVS: Allow null argument to ip_vs_scheduler_put(), Simon Horman <= [patch v2 06/12] [PATCH 06/12] IPVS: ip_vs_{un,}bind_scheduler NULL arguments, Simon Horman [patch v2 07/12] [PATCH 07/12] IPVS: Add struct ip_vs_pe, Simon Horman Re: [patch v2 07/12] [PATCH 07/12] IPVS: Add struct ip_vs_pe, Julian Anastasov Re: [patch v2 07/12] [PATCH 07/12] IPVS: Add struct ip_vs_pe, Simon Horman [patch v2 08/12] [PATCH 08/12] IPVS: Add persistence engine data to /proc/net/ip_vs_conn, Simon Horman Re: [patch v2 08/12] [PATCH 08/12] IPVS: Add persistence engine data to /proc/net/ip_vs_conn, Julian Anastasov Re: [patch v2 08/12] [PATCH 08/12] IPVS: Add persistence engine data to /proc/net/ip_vs_conn, Simon Horman [patch v2 09/12] [PATCH 09/12] IPVS: management of persistence engine modules, Simon Horman [patch v2 10/12] [PATCH 10/12] IPVS: Allow configuration of persistence engines, Simon Horman [patch v2 11/12] [PATCH 11/12] IPVS: Fallback if persistence engine fails, Simon Horman

<Prev in Thread]

Current Thread

[Next in Thread>

Previous by Date:	[patch v2 04/12] [PATCH 04/12] IPVS: Add struct ip_vs_conn_param, Simon Horman
Next by Date:	[patch v2 06/12] [PATCH 06/12] IPVS: ip_vs_{un,}bind_scheduler NULL arguments, Simon Horman
Previous by Thread:	Re: [patch v2 04/12] [PATCH 04/12] IPVS: Add struct ip_vs_conn_param, Simon Horman
Next by Thread:	[patch v2 06/12] [PATCH 06/12] IPVS: ip_vs_{un,}bind_scheduler NULL arguments, Simon Horman
Indexes:	[Date] [Thread] [Top] [All Lists]

Previous by Date:

[patch v2 04/12] [PATCH 04/12] IPVS: Add struct ip_vs_conn_param, Simon Horman

Next by Date:

[patch v2 06/12] [PATCH 06/12] IPVS: ip_vs_{un,}bind_scheduler NULL arguments, Simon Horman

Previous by Thread:

Re: [patch v2 04/12] [PATCH 04/12] IPVS: Add struct ip_vs_conn_param, Simon Horman

Next by Thread:

[patch v2 06/12] [PATCH 06/12] IPVS: ip_vs_{un,}bind_scheduler NULL arguments, Simon Horman

Indexes:

[Date] [Thread] [Top] [All Lists]

[patch v2 05/12] [PATCH 05/12] IPVS: Allow null argument to ip_vs_schedu