Home » Mailing list archives » linux-netdev » 2010 » October » 1

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

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Simon Horman
Subject: [patch v2 06/12] [PATCH 06/12] IPVS: ip_vs_{un,}bind_scheduler NULL arguments
Date: Friday, October 1, 2010 - 7:35 am

In general NULL arguments aren't passed by the few callers that exist,
so don't test for them.

The exception is to make passing NULL to ip_vs_unbind_scheduler() a noop.

Signed-off-by: Simon Horman <horms@verge.net.au>

v2
* Trivial rediff

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 84dae47..d57cc4a 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -1229,8 +1229,7 @@ ip_vs_add_service(struct ip_vs_service_user_kern *u,
 
  out_err:
 	if (svc != NULL) {
-		if (svc->scheduler)
-			ip_vs_unbind_scheduler(svc);
+		ip_vs_unbind_scheduler(svc);
 		if (svc->inc) {
 			local_bh_disable();
 			ip_vs_app_inc_put(svc->inc);
diff --git a/net/netfilter/ipvs/ip_vs_sched.c b/net/netfilter/ipvs/ip_vs_sched.c
index cd77902..be0780a 100644
--- a/net/netfilter/ipvs/ip_vs_sched.c
+++ b/net/netfilter/ipvs/ip_vs_sched.c
@@ -46,15 +46,6 @@ int ip_vs_bind_scheduler(struct ip_vs_service *svc,
 {
 	int ret;
 
-	if (svc == NULL) {
-		pr_err("%s(): svc arg NULL\n", __func__);
-		return -EINVAL;
-	}
-	if (scheduler == NULL) {
-		pr_err("%s(): scheduler arg NULL\n", __func__);
-		return -EINVAL;
-	}
-
 	svc->scheduler = scheduler;
 
 	if (scheduler->init_service) {
@@ -74,18 +65,10 @@ int ip_vs_bind_scheduler(struct ip_vs_service *svc,
  */
 int ip_vs_unbind_scheduler(struct ip_vs_service *svc)
 {
-	struct ip_vs_scheduler *sched;
+	struct ip_vs_scheduler *sched = svc->scheduler;
 
-	if (svc == NULL) {
-		pr_err("%s(): svc arg NULL\n", __func__);
-		return -EINVAL;
-	}
-
-	sched = svc->scheduler;
-	if (sched == NULL) {
-		pr_err("%s(): svc isn't bound\n", __func__);
-		return -EINVAL;
-	}
+	if (!sched)
+		return 0;
 
 	if (sched->done_service) {
 		if (sched->done_service(svc) != 0) {
-- 
1.7.1


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[patch v2 00/12] IPVS: SIP Persistence Engine, Simon Horman, (Fri Oct 1, 7:35 am)
[patch v2 01/12] [PATCH 01/12] netfilter: nf_conntrack_sip ..., Simon Horman, (Fri Oct 1, 7:35 am)
[patch v2 02/12] [PATCH 02/12] netfilter: nf_conntrack_sip ..., Simon Horman, (Fri Oct 1, 7:35 am)
[patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sched_p ..., Simon Horman, (Fri Oct 1, 7:35 am)
[patch v2 04/12] [PATCH 04/12] IPVS: Add struct ip_vs_conn ..., Simon Horman, (Fri Oct 1, 7:35 am)
[patch v2 05/12] [PATCH 05/12] IPVS: Allow null argument t ..., Simon Horman, (Fri Oct 1, 7:35 am)
[patch v2 06/12] [PATCH 06/12] IPVS: ip_vs_{un,}bind_sched ..., Simon Horman, (Fri Oct 1, 7:35 am)
[patch v2 07/12] [PATCH 07/12] IPVS: Add struct ip_vs_pe, Simon Horman, (Fri Oct 1, 7:35 am)
[patch v2 08/12] [PATCH 08/12] IPVS: Add persistence engin ..., Simon Horman, (Fri Oct 1, 7:35 am)
[patch v2 09/12] [PATCH 09/12] IPVS: management of persist ..., Simon Horman, (Fri Oct 1, 7:35 am)
[patch v2 10/12] [PATCH 10/12] IPVS: Allow configuration o ..., Simon Horman, (Fri Oct 1, 7:35 am)
[patch v2 11/12] [PATCH 11/12] IPVS: Fallback if persisten ..., Simon Horman, (Fri Oct 1, 7:35 am)
[patch v2 12/12] [PATCH 12/12] IPVS: sip persistence engine, Simon Horman, (Fri Oct 1, 7:35 am)
Re: [patch v2 00/12] IPVS: SIP Persistence Engine, Simon Horman, (Fri Oct 1, 8:09 am)
Re: [patch v2 04/12] [PATCH 04/12] IPVS: Add struct ip_vs_ ..., Julian Anastasov, (Fri Oct 1, 1:58 pm)
Re: [patch v2 07/12] [PATCH 07/12] IPVS: Add struct ip_vs_pe, Julian Anastasov, (Fri Oct 1, 2:45 pm)
Re: [patch v2 08/12] [PATCH 08/12] IPVS: Add persistence e ..., Julian Anastasov, (Fri Oct 1, 2:50 pm)
Re: [patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sch ..., Julian Anastasov, (Fri Oct 1, 3:35 pm)
Re: [patch v2 04/12] [PATCH 04/12] IPVS: Add struct ip_vs_ ..., Simon Horman, (Fri Oct 1, 6:13 pm)
Re: [patch v2 04/12] [PATCH 04/12] IPVS: Add struct ip_vs_ ..., Simon Horman, (Fri Oct 1, 6:15 pm)
Re: [patch v2 07/12] [PATCH 07/12] IPVS: Add struct ip_vs_pe, Simon Horman, (Fri Oct 1, 6:55 pm)
Re: [patch v2 08/12] [PATCH 08/12] IPVS: Add persistence e ..., Simon Horman, (Fri Oct 1, 6:58 pm)
Re: [patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sch ..., Simon Horman, (Fri Oct 1, 7:20 pm)
Re: [patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sch ..., Julian Anastasov, (Sat Oct 2, 12:56 am)
Re: [patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sch ..., Simon Horman, (Sat Oct 2, 1:08 am)
Re: [patch v2 03/12] [PATCH 03/12] IPVS: compact ip_vs_sch ..., Julian Anastasov, (Mon Oct 4, 3:36 pm)