From b74c2c28d9a15b3cefa616d43aec021fcaba1aed Mon Sep 17 00:00:00 2001
From: Simon Horman <horms@verge.net.au>
Date: Sun, 22 Aug 2010 21:37:52 +0900
Subject: [PATCH] --- yaml --- r: 215463 b: refs/heads/master c:
 2fabf35bfcd89445c54cf1e6a5437dd3cf924a92 h: refs/heads/master i:   215461:
 9a2a4fe267fc3da9c16db51b48afd603b0a9c350   215459:
 ae7700220c3c84b3c15a36f44ca18dd0f4d015b5   215455:
 b604efa7ccdb04e5f568b8c1287b56a96a8482c3 v: v3

---
 [refs]                                 |  2 +-
 trunk/net/netfilter/ipvs/ip_vs_ctl.c   |  3 +--
 trunk/net/netfilter/ipvs/ip_vs_sched.c | 23 +++--------------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index ca0f4b32f0bd..02f4a9c92793 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e08bfb879574524cc9a67be960c684989fd986c
+refs/heads/master: 2fabf35bfcd89445c54cf1e6a5437dd3cf924a92
diff --git a/trunk/net/netfilter/ipvs/ip_vs_ctl.c b/trunk/net/netfilter/ipvs/ip_vs_ctl.c
index f7afcfe4dbc5..5f20caf47a1d 100644
--- a/trunk/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/trunk/net/netfilter/ipvs/ip_vs_ctl.c
@@ -1206,8 +1206,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/trunk/net/netfilter/ipvs/ip_vs_sched.c b/trunk/net/netfilter/ipvs/ip_vs_sched.c
index 9f94e328d31e..076ebe00435d 100644
--- a/trunk/net/netfilter/ipvs/ip_vs_sched.c
+++ b/trunk/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) {